From 79f1918f78d8c9b5acf15c5efa73f825bde04384 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 13 Jul 2012 15:45:33 +0200
Subject: [PATCH] --- yaml --- r: 313864 b: refs/heads/master c:
 0008204ffe85d23382d6fd0f971f3f0fbe70bae2 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/s390/kernel/processor.c | 2 ++
 trunk/arch/s390/kernel/smp.c       | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8a26804e3550..a59e89aa2656 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8738e07d5c9b5b02f113c7e0ba67f0d8d6a5b23c
+refs/heads/master: 0008204ffe85d23382d6fd0f971f3f0fbe70bae2
diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/arch/s390/kernel/processor.c
index 6e0073e43f54..07c7bf47d618 100644
--- a/trunk/arch/s390/kernel/processor.c
+++ b/trunk/arch/s390/kernel/processor.c
@@ -26,12 +26,14 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
 void __cpuinit cpu_init(void)
 {
 	struct cpuid *id = &per_cpu(cpu_id, smp_processor_id());
+	struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
 
 	get_cpu_id(id);
 	atomic_inc(&init_mm.mm_count);
 	current->active_mm = &init_mm;
 	BUG_ON(current->mm);
 	enter_lazy_tlb(&init_mm, current);
+	memset(idle, 0, sizeof(*idle));
 }
 
 /*
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index dc602a61233f..22257f241d07 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -959,14 +959,11 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
 	unsigned int cpu = (unsigned int)(long)hcpu;
 	struct cpu *c = &pcpu_devices[cpu].cpu;
 	struct device *s = &c->dev;
-	struct s390_idle_data *idle;
 	int err = 0;
 
 	switch (action) {
 	case CPU_ONLINE:
 	case CPU_ONLINE_FROZEN:
-		idle = &per_cpu(s390_idle, cpu);
-		memset(idle, 0, sizeof(struct s390_idle_data));
 		err = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
 		break;
 	case CPU_DEAD: