From 663aa92aaaf91e5a8ff420c15b8c4845c16a7046 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 16 Sep 2005 19:27:34 -0700
Subject: [PATCH] --- yaml --- r: 9005 b: refs/heads/master c:
 b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51 h: refs/heads/master i:   9003:
 01f483e8140a1a599e422dfaa110b12ea5d1daa9 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/setup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a29bb4191e9e..d96872f5f1df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90f4e12112284f1a41594e2950e6eced5b064efc
+refs/heads/master: b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 5ba5a5485da9..907d16ac9dc9 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         struct cpuinfo_S390 *cpuinfo;
 	unsigned long n = (unsigned long) v - 1;
 
+	preempt_disable();
 	if (!n) {
 		seq_printf(m, "vendor_id       : IBM/S390\n"
 			       "# processors    : %i\n"
@@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 			       cpuinfo->cpu_id.ident,
 			       cpuinfo->cpu_id.machine);
 	}
+	preempt_enable();
         return 0;
 }