diff options
Diffstat (limited to 'arch/powerpc/include/asm/topology.h')
-rw-r--r-- | arch/powerpc/include/asm/topology.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 9f421641a35c..16b077801a5f 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
@@ -91,6 +91,7 @@ extern int start_topology_update(void); | |||
91 | extern int stop_topology_update(void); | 91 | extern int stop_topology_update(void); |
92 | extern int prrn_is_enabled(void); | 92 | extern int prrn_is_enabled(void); |
93 | extern int find_and_online_cpu_nid(int cpu); | 93 | extern int find_and_online_cpu_nid(int cpu); |
94 | extern int timed_topology_update(int nsecs); | ||
94 | #else | 95 | #else |
95 | static inline int start_topology_update(void) | 96 | static inline int start_topology_update(void) |
96 | { | 97 | { |
@@ -108,16 +109,12 @@ static inline int find_and_online_cpu_nid(int cpu) | |||
108 | { | 109 | { |
109 | return 0; | 110 | return 0; |
110 | } | 111 | } |
112 | static inline int timed_topology_update(int nsecs) | ||
113 | { | ||
114 | return 0; | ||
115 | } | ||
111 | #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ | 116 | #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ |
112 | 117 | ||
113 | #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_NEED_MULTIPLE_NODES) | ||
114 | #if defined(CONFIG_PPC_SPLPAR) | ||
115 | extern int timed_topology_update(int nsecs); | ||
116 | #else | ||
117 | #define timed_topology_update(nsecs) | ||
118 | #endif /* CONFIG_PPC_SPLPAR */ | ||
119 | #endif /* CONFIG_HOTPLUG_CPU || CONFIG_NEED_MULTIPLE_NODES */ | ||
120 | |||
121 | #include <asm-generic/topology.h> | 118 | #include <asm-generic/topology.h> |
122 | 119 | ||
123 | #ifdef CONFIG_SMP | 120 | #ifdef CONFIG_SMP |