---

yaml --- r: 179279 b: refs/heads/master c: c6a5f8c h: refs/heads/master i: 179277: c33c6cd 179275: d7ba397 179271: 49d9c6c 179263: 189aa40 v: v3
git-mirror · Jan 13, 2010 · 617b549 · 617b549
1 parent ed8af9f
commit 617b549
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;