---

yaml --- r: 9005 b: refs/heads/master c: b7ae9dd h: refs/heads/master i: 9003: 01f483e v: v3
git-mirror · Sep 17, 2005 · 663aa92 · 663aa92
1 parent 2aa4361
commit 663aa92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }