diff --git a/[refs] b/[refs]
index 58aca574052a..8f6d4cb15422 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de400d6b78d15a73023485f050bc6b1709dc7a79
+refs/heads/master: dd4a5a31fc06a2cda4f6a1d9de74b9009f8e31de
diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/arch/s390/kernel/processor.c
index 311e9d712888..6e0073e43f54 100644
--- a/trunk/arch/s390/kernel/processor.c
+++ b/trunk/arch/s390/kernel/processor.c
@@ -74,7 +74,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
-	return *pos < NR_CPUS ? (void *)((unsigned long) *pos + 1) : NULL;
+	return *pos < nr_cpu_ids ? (void *)((unsigned long) *pos + 1) : NULL;
 }
 
 static void *c_next(struct seq_file *m, void *v, loff_t *pos)