git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devicetree/merge' into spi/merge
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
numa_64.h
diff --git
a/arch/x86/include/asm/numa_64.h
b/arch/x86/include/asm/numa_64.h
index
5ae8728
..
0493be3
100644
(file)
--- a/
arch/x86/include/asm/numa_64.h
+++ b/
arch/x86/include/asm/numa_64.h
@@
-40,6
+40,7
@@
extern void __cpuinit numa_remove_cpu(int cpu);
#ifdef CONFIG_NUMA_EMU
#define FAKE_NODE_MIN_SIZE ((u64)32 << 20)
#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL))
+void numa_emu_cmdline(char *);
#endif /* CONFIG_NUMA_EMU */
#else
static inline void init_cpu_to_node(void) { }