[PATCH] PowerPC/PCI Hotplug build break

[safe/jmp/linux-2.6] / arch / powerpc / platforms / pseries / smp.c

diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 3ba794c..8e6b1ed 100644 (file)
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -46,11 +46,12 @@
 #include <asm/rtas.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/mpic.h>
-#include <asm/systemcfg.h>
+#include <asm/vdso_datapage.h>
 
 #include "plpar_wrappers.h"
 
 #ifdef DEBUG
+#include <asm/udbg.h>
 #define DBG(fmt...) udbg_printf(fmt)
 #else
 #define DBG(fmt...)
@@ -92,12 +93,12 @@ static int query_cpu_stopped(unsigned int pcpu)
        return cpu_status;
 }
 
-int pSeries_cpu_disable(void)
+static int pSeries_cpu_disable(void)
 {
        int cpu = smp_processor_id();
 
        cpu_clear(cpu, cpu_online_map);
-       _systemcfg->processorCount--;
+       vdso_data->processorCount--;
 
        /*fix boot_cpuid here*/
        if (cpu == boot_cpuid)
@@ -108,7 +109,7 @@ int pSeries_cpu_disable(void)
        return 0;
 }
 
-void pSeries_cpu_die(unsigned int cpu)
+static void pSeries_cpu_die(unsigned int cpu)
 {
        int tries;
        int cpu_status;
@@ -281,7 +282,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
        pcpu = get_hard_smp_processor_id(lcpu);
 
        /* Fixup atomic count: it exited inside IRQ handler. */
-       paca[lcpu].__current->thread_info->preempt_count        = 0;
+       task_thread_info(paca[lcpu].__current)->preempt_count   = 0;
 
        /* 
         * If the RTAS start-cpu token does not exist then presume the