From 617b5491c6dacbd3cb3ea8de7c4930222145e411 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 13 Jan 2010 20:44:35 +0100
Subject: [PATCH] --- yaml --- r: 179279 b: refs/heads/master c:
 c6a5f8cea2e5454fce3859ca5ed381c2535184cf h: refs/heads/master i:   179277:
 c33c6cd0b6018e694fa3a93cb13e6a4233d79b72   179275:
 d7ba397ab2800faeb31e7f1d4e7e219d54c32f8b   179271:
 49d9c6c3bf7897dc7c1c05f7c6a25c41abe6ba8d   179263:
 189aa4086965491c14cb1b7b0fd3018f2832ea03 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/s390/include/asm/sigp.h | 2 +-
 trunk/arch/s390/kernel/setup.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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;