summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/numa.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-17 16:26:28 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 16:26:28 +0100
commit0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch)
treef6bdb892cec8ca0df69c08a3477c89f1542999e5 /include/asm-x86_64/numa.h
parentMerge branch 'upstream' (diff)
parent[PATCH] libata: add a function to decide if we need iordy (diff)
downloadlinux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.xz
linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip
Merge branch 'upstream'
Diffstat (limited to 'include/asm-x86_64/numa.h')
-rw-r--r--include/asm-x86_64/numa.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h
index d51e56fdc3da..34e434ce3268 100644
--- a/include/asm-x86_64/numa.h
+++ b/include/asm-x86_64/numa.h
@@ -20,6 +20,11 @@ extern int numa_off;
extern void numa_set_node(int cpu, int node);
extern unsigned char apicid_to_node[256];
+#ifdef CONFIG_NUMA
+extern void __init init_cpu_to_node(void);
+#else
+#define init_cpu_to_node() do {} while (0)
+#endif
#define NUMA_NO_NODE 0xff