projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5cd7376
)
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/travis...
author
Ingo Molnar
<mingo@elte.hu>
Thu, 15 Jan 2009 17:37:07 +0000
(18:37 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 15 Jan 2009 17:37:07 +0000
(18:37 +0100)
arch/x86/include/asm/topology.h
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/include/asm/topology.h
b/arch/x86/include/asm/topology.h
index 4e2f2e0aab27b277eaff75a285b60d495cd2e1db..d0c68e2916357701b51e764a19e17419ddefb22a 100644
(file)
--- a/
arch/x86/include/asm/topology.h
+++ b/
arch/x86/include/asm/topology.h
@@
-192,9
+192,20
@@
extern int __node_distance(int, int);
#else /* !CONFIG_NUMA */
-#define numa_node_id() 0
-#define cpu_to_node(cpu) 0
-#define early_cpu_to_node(cpu) 0
+static inline int numa_node_id(void)
+{
+ return 0;
+}
+
+static inline int cpu_to_node(int cpu)
+{
+ return 0;
+}
+
+static inline int early_cpu_to_node(int cpu)
+{
+ return 0;
+}
static inline const cpumask_t *cpumask_of_node(int node)
{