diff --git a/[refs] b/[refs]
index a01a5c2ef4dd..df69cbcd314d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02beaccc901b7a28ac1de79f3ed122f5fda220b1
+refs/heads/master: c6a5f8cea2e5454fce3859ca5ed381c2535184cf
diff --git a/trunk/arch/s390/include/asm/sigp.h b/trunk/arch/s390/include/asm/sigp.h
index ec403d4304f8..0cc620a6a2cc 100644
--- a/trunk/arch/s390/include/asm/sigp.h
+++ b/trunk/arch/s390/include/asm/sigp.h
@@ -19,7 +19,7 @@
 #include <asm/atomic.h>
 
 /* get real cpu address from logical cpu number */
-extern volatile int __cpu_logical_map[];
+extern int __cpu_logical_map[];
 
 typedef enum
 {
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 2d6a265b0145..3fe1680c3899 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -87,7 +87,7 @@ unsigned long elf_hwcap = 0;
 char elf_platform[ELF_PLATFORM_SIZE];
 
 struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
-volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
+int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
 
 int __initdata memory_end_set;
 unsigned long __initdata memory_end;