diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/sigp.h | 2 | ||||
-rw-r--r-- | arch/s390/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h index ec403d4304f8..0cc620a6a2cc 100644 --- a/arch/s390/include/asm/sigp.h +++ b/arch/s390/include/asm/sigp.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <asm/atomic.h> | 19 | #include <asm/atomic.h> |
20 | 20 | ||
21 | /* get real cpu address from logical cpu number */ | 21 | /* get real cpu address from logical cpu number */ |
22 | extern volatile int __cpu_logical_map[]; | 22 | extern int __cpu_logical_map[]; |
23 | 23 | ||
24 | typedef enum | 24 | typedef enum |
25 | { | 25 | { |
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 2d6a265b0145..3fe1680c3899 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -87,7 +87,7 @@ unsigned long elf_hwcap = 0; | |||
87 | char elf_platform[ELF_PLATFORM_SIZE]; | 87 | char elf_platform[ELF_PLATFORM_SIZE]; |
88 | 88 | ||
89 | struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS]; | 89 | struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS]; |
90 | volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */ | 90 | int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */ |
91 | 91 | ||
92 | int __initdata memory_end_set; | 92 | int __initdata memory_end_set; |
93 | unsigned long __initdata memory_end; | 93 | unsigned long __initdata memory_end; |