summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-01-13 20:44:35 +0100
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-01-13 20:44:45 +0100
commitc6a5f8cea2e5454fce3859ca5ed381c2535184cf (patch)
treec2b7dce50da44d79e3669bda8152d6d0f9357dc8
parent02beaccc901b7a28ac1de79f3ed122f5fda220b1 (diff)
downloadkernel-crypto-c6a5f8cea2e5454fce3859ca5ed381c2535184cf.tar.gz
kernel-crypto-c6a5f8cea2e5454fce3859ca5ed381c2535184cf.tar.xz
kernel-crypto-c6a5f8cea2e5454fce3859ca5ed381c2535184cf.zip
[S390] smp: remove volatile type quilifier from __cpu_logical_map
Remove pointless qualifier. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/sigp.h2
-rw-r--r--arch/s390/kernel/setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
index ec403d4304f..0cc620a6a2c 100644
--- a/arch/s390/include/asm/sigp.h
+++ b/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/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 2d6a265b014..3fe1680c389 100644
--- a/arch/s390/kernel/setup.c
+++ b/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;