diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 18:56:29 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 18:56:29 -0500 |
commit | 5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9 (patch) | |
tree | bf9c89392f11d343734362147fad82170465d8a7 /arch/powerpc/include | |
parent | 39bf990ead35c7263652ca5dd8262b2b2cd147ac (diff) |
powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/topology.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index fbfcfd04d25a..7ef0d90defc8 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
@@ -93,19 +93,6 @@ extern void __init dump_numa_cpu_topology(void); | |||
93 | extern int sysfs_add_device_to_node(struct sys_device *dev, int nid); | 93 | extern int sysfs_add_device_to_node(struct sys_device *dev, int nid); |
94 | extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid); | 94 | extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid); |
95 | 95 | ||
96 | #ifdef CONFIG_PPC_SPLPAR | ||
97 | extern int start_topology_update(void); | ||
98 | extern int stop_topology_update(void); | ||
99 | #else | ||
100 | static inline int start_topology_update(void) | ||
101 | { | ||
102 | return 0; | ||
103 | } | ||
104 | static inline int stop_topology_update(void) | ||
105 | { | ||
106 | return 0; | ||
107 | } | ||
108 | #endif /* CONFIG_PPC_SPLPAR */ | ||
109 | #else | 96 | #else |
110 | 97 | ||
111 | static inline void dump_numa_cpu_topology(void) {} | 98 | static inline void dump_numa_cpu_topology(void) {} |
@@ -121,6 +108,20 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev, | |||
121 | } | 108 | } |
122 | #endif /* CONFIG_NUMA */ | 109 | #endif /* CONFIG_NUMA */ |
123 | 110 | ||
111 | #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR) | ||
112 | extern int start_topology_update(void); | ||
113 | extern int stop_topology_update(void); | ||
114 | #else | ||
115 | static inline int start_topology_update(void) | ||
116 | { | ||
117 | return 0; | ||
118 | } | ||
119 | static inline int stop_topology_update(void) | ||
120 | { | ||
121 | return 0; | ||
122 | } | ||
123 | #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ | ||
124 | |||
124 | #include <asm-generic/topology.h> | 125 | #include <asm-generic/topology.h> |
125 | 126 | ||
126 | #ifdef CONFIG_SMP | 127 | #ifdef CONFIG_SMP |