git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/printk' into tracing/ftrace
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
numa_64.c
diff --git
a/arch/x86/mm/numa_64.c
b/arch/x86/mm/numa_64.c
index 71a14f89f89e7367c72f2de85da6708acc83c069..f3516da035d141947d04ddfbd61bd56f74623fd3 100644
(file)
--- a/
arch/x86/mm/numa_64.c
+++ b/
arch/x86/mm/numa_64.c
@@
-145,7
+145,7
@@
int __init compute_hash_shift(struct bootnode *nodes, int numnodes,
return shift;
}
-int early_pfn_to_nid(unsigned long pfn)
+int
__meminit __
early_pfn_to_nid(unsigned long pfn)
{
return phys_to_nid(pfn << PAGE_SHIFT);
}