5 files changed, 42 insertions, 20 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 5c330c3366e4..36d67a8d7cbb 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -510,6 +510,7 @@ int __devinit start_secondary(void *unused)
 
         smp_store_cpu_info(cpu);
         set_dec(tb_ticks_per_jiffy);
+        preempt_disable();
         cpu_callin_map[cpu] = 1;
 
         smp_ops->setup_cpu(cpu);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 32f215825e8d..0578f8387603 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -887,10 +887,6 @@ void altivec_unavailable_exception(struct pt_regs *regs)
         die("Unrecoverable VMX/Altivec Unavailable Exception", regs, SIGABRT);
 }
 
-#ifdef CONFIG_PPC64
-extern perf_irq_t perf_irq;
-#endif
-
 #if defined(CONFIG_PPC64) || defined(CONFIG_E500)
 void performance_monitor_exception(struct pt_regs *regs)
 {
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 97082a4203ad..71a6addf9f7f 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -21,6 +21,7 @@
 #include <asm/iommu.h>
 #include <asm/dma.h>
 #include <asm/vio.h>
+#include <asm/prom.h>
 
 static const struct vio_device_id *vio_match_device(
                 const struct vio_device_id *, const struct vio_dev *);
@@ -265,7 +266,33 @@ static int vio_bus_match(struct device *dev, struct device_driver *drv)
         return (ids != NULL) && (vio_match_device(ids, vio_dev) != NULL);
 }
 
+static int vio_hotplug(struct device *dev, char **envp, int num_envp,
+                        char *buffer, int buffer_size)
+{
+        const struct vio_dev *vio_dev = to_vio_dev(dev);
+        char *cp;
+        int length;
+
+        if (!num_envp)
+                return -ENOMEM;
+
+        if (!vio_dev->dev.platform_data)
+                return -ENODEV;
+        cp = (char *)get_property(vio_dev->dev.platform_data, "compatible", &length);
+        if (!cp)
+                return -ENODEV;
+
+        envp[0] = buffer;
+        length = scnprintf(buffer, buffer_size, "MODALIAS=vio:T%sS%s",
+                                vio_dev->type, cp);
+        if (buffer_size - length <= 0)
+                return -ENOMEM;
+        envp[1] = NULL;
+        return 0;
+}
+
 struct bus_type vio_bus_type = {
         .name = "vio",
+        .hotplug = vio_hotplug,
         .match = vio_bus_match,
 };
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index d3e4bf756c83..7f8f0cda6a74 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -694,20 +694,19 @@ static void iseries_shared_idle(void)
                 if (hvlpevent_is_pending())
                         process_iSeries_events();
 
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
 static void iseries_dedicated_idle(void)
 {
         long oldval;
+        set_thread_flag(TIF_POLLING_NRFLAG);
 
         while (1) {
-                oldval = test_and_clear_thread_flag(TIF_NEED_RESCHED);
-
-                if (!oldval) {
-                        set_thread_flag(TIF_POLLING_NRFLAG);
-
+                if (!need_resched()) {
                         while (!need_resched()) {
                                 ppc64_runlatch_off();
                                 HMT_low();
@@ -720,13 +719,12 @@ static void iseries_dedicated_idle(void)
                         }
 
                         HMT_medium();
-                        clear_thread_flag(TIF_POLLING_NRFLAG);
-                } else {
-                        set_need_resched();
                 }
 
                 ppc64_runlatch_on();
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e78c39368841..a093a0d4dd69 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -469,6 +469,7 @@ static inline void dedicated_idle_sleep(unsigned int cpu)
                  * more.
                  */
                 clear_thread_flag(TIF_POLLING_NRFLAG);
+                smp_mb__after_clear_bit();
 
                 /*
                  * SMT dynamic mode. Cede will result in this thread going
@@ -481,6 +482,7 @@ static inline void dedicated_idle_sleep(unsigned int cpu)
                         cede_processor();
                 else
                         local_irq_enable();
+                set_thread_flag(TIF_POLLING_NRFLAG);
         } else {
                 /*
                  * Give the HV an opportunity at the processor, since we are
@@ -492,11 +494,11 @@ static inline void dedicated_idle_sleep(unsigned int cpu)
 
 static void pseries_dedicated_idle(void)
 { 
-        long oldval;
         struct paca_struct *lpaca = get_paca();
         unsigned int cpu = smp_processor_id();
         unsigned long start_snooze;
         unsigned long *smt_snooze_delay = &__get_cpu_var(smt_snooze_delay);
+        set_thread_flag(TIF_POLLING_NRFLAG);
 
         while (1) {
                 /*
@@ -505,10 +507,7 @@ static void pseries_dedicated_idle(void)
                  */
                 lpaca->lppaca.idle = 1;
 
-                oldval = test_and_clear_thread_flag(TIF_NEED_RESCHED);
-                if (!oldval) {
-                        set_thread_flag(TIF_POLLING_NRFLAG);
-
+                if (!need_resched()) {
                         start_snooze = __get_tb() +
                                 *smt_snooze_delay * tb_ticks_per_usec;
 
@@ -531,15 +530,14 @@ static void pseries_dedicated_idle(void)
                         }
 
                         HMT_medium();
-                        clear_thread_flag(TIF_POLLING_NRFLAG);
-                } else {
-                        set_need_resched();
                 }
 
                 lpaca->lppaca.idle = 0;
                 ppc64_runlatch_on();
 
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
 
                 if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
                         cpu_die();
@@ -583,7 +581,9 @@ static void pseries_shared_idle(void)
                 lpaca->lppaca.idle = 0;
                 ppc64_runlatch_on();
 
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
 
                 if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
                         cpu_die();