diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries/dlpar.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/dlpar.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 12df9e8812a9..37bce52526da 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c | |||
@@ -236,7 +236,9 @@ static struct device_node *derive_parent(const char *path) | |||
236 | 236 | ||
237 | int dlpar_attach_node(struct device_node *dn) | 237 | int dlpar_attach_node(struct device_node *dn) |
238 | { | 238 | { |
239 | #ifdef CONFIG_PROC_DEVICETREE | ||
239 | struct proc_dir_entry *ent; | 240 | struct proc_dir_entry *ent; |
241 | #endif | ||
240 | int rc; | 242 | int rc; |
241 | 243 | ||
242 | of_node_set_flag(dn, OF_DYNAMIC); | 244 | of_node_set_flag(dn, OF_DYNAMIC); |
@@ -267,10 +269,10 @@ int dlpar_attach_node(struct device_node *dn) | |||
267 | 269 | ||
268 | int dlpar_detach_node(struct device_node *dn) | 270 | int dlpar_detach_node(struct device_node *dn) |
269 | { | 271 | { |
272 | #ifdef CONFIG_PROC_DEVICETREE | ||
270 | struct device_node *parent = dn->parent; | 273 | struct device_node *parent = dn->parent; |
271 | struct property *prop = dn->properties; | 274 | struct property *prop = dn->properties; |
272 | 275 | ||
273 | #ifdef CONFIG_PROC_DEVICETREE | ||
274 | while (prop) { | 276 | while (prop) { |
275 | remove_proc_entry(prop->name, dn->pde); | 277 | remove_proc_entry(prop->name, dn->pde); |
276 | prop = prop->next; | 278 | prop = prop->next; |
@@ -344,18 +346,6 @@ int dlpar_release_drc(u32 drc_index) | |||
344 | 346 | ||
345 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE | 347 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE |
346 | 348 | ||
347 | static DEFINE_MUTEX(pseries_cpu_hotplug_mutex); | ||
348 | |||
349 | void cpu_hotplug_driver_lock() | ||
350 | { | ||
351 | mutex_lock(&pseries_cpu_hotplug_mutex); | ||
352 | } | ||
353 | |||
354 | void cpu_hotplug_driver_unlock() | ||
355 | { | ||
356 | mutex_unlock(&pseries_cpu_hotplug_mutex); | ||
357 | } | ||
358 | |||
359 | static int dlpar_online_cpu(struct device_node *dn) | 349 | static int dlpar_online_cpu(struct device_node *dn) |
360 | { | 350 | { |
361 | int rc = 0; | 351 | int rc = 0; |