1 files changed, 12 insertions, 7 deletions

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 958704798f4a..a7125b62a9a6 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -59,7 +59,7 @@ enum {
 };
 
 struct pcpu {
-        struct cpu cpu;
+        struct cpu *cpu;
         struct _lowcore *lowcore;       /* lowcore page(s) for the cpu */
         unsigned long async_stack;      /* async stack for the cpu */
         unsigned long panic_stack;      /* panic stack for the cpu */
@@ -159,9 +159,9 @@ static void pcpu_ec_call(struct pcpu *pcpu, int ec_bit)
 {
         int order;
 
-        set_bit(ec_bit, &pcpu->ec_mask);
-        order = pcpu_running(pcpu) ?
-                SIGP_EXTERNAL_CALL : SIGP_EMERGENCY_SIGNAL;
+        if (test_and_set_bit(ec_bit, &pcpu->ec_mask))
+                return;
+        order = pcpu_running(pcpu) ? SIGP_EXTERNAL_CALL : SIGP_EMERGENCY_SIGNAL;
         pcpu_sigp_retry(pcpu, order, 0);
 }
 
@@ -965,7 +965,7 @@ static int smp_cpu_notify(struct notifier_block *self, unsigned long action,
                           void *hcpu)
 {
         unsigned int cpu = (unsigned int)(long)hcpu;
-        struct cpu *c = &pcpu_devices[cpu].cpu;
+        struct cpu *c = pcpu_devices[cpu].cpu;
         struct device *s = &c->dev;
         int err = 0;
 
@@ -982,10 +982,15 @@ static int smp_cpu_notify(struct notifier_block *self, unsigned long action,
 
 static int smp_add_present_cpu(int cpu)
 {
-        struct cpu *c = &pcpu_devices[cpu].cpu;
-        struct device *s = &c->dev;
+        struct device *s;
+        struct cpu *c;
         int rc;
 
+        c = kzalloc(sizeof(*c), GFP_KERNEL);
+        if (!c)
+                return -ENOMEM;
+        pcpu_devices[cpu].cpu = c;
+        s = &c->dev;
         c->hotpluggable = 1;
         rc = register_cpu(c, cpu);
         if (rc)