---

yaml --- r: 100692 b: refs/heads/master c: 8ff7f2a h: refs/heads/master v: v3
git-mirror · May 30, 2008 · f18dab5 · f18dab5
1 parent 6420b91
commit f18dab5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4831fbe096a6f4f691fd71b041ce27add54088e
+refs/heads/master: 8ff7f2a46bd8831e1f1f2a694ec13921720180b7
diff --git a/trunk/arch/arm/kernel/atags.c b/trunk/arch/arm/kernel/atags.c
@@ -1,5 +1,4 @@
 #include <linux/slab.h>
-#include <linux/kexec.h>
 #include <linux/proc_fs.h>
 #include <asm/setup.h>
 #include <asm/types.h>
@@ -42,14 +41,14 @@ create_proc_entries(void)
 	return 0;
 }
 
-
-static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE];
+#define BOOT_PARAMS_SIZE 1536
+static char __initdata atags_copy_buf[BOOT_PARAMS_SIZE];
 static char __initdata *atags_copy;
 
 void __init save_atags(const struct tag *tags)
 {
 	atags_copy = atags_copy_buf;
-	memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE);
+	memcpy(atags_copy, tags, sizeof(atags_copy_buf));
 }
 
 

diff --git a/trunk/include/asm-arm/arch-ns9xxx/hardware.h b/trunk/include/asm-arm/arch-ns9xxx/hardware.h
@@ -66,13 +66,13 @@
 	 __REGGET(var, reg ## _ ## field) / __REGSHIFT(reg ## _ ## field)
 
 #  define REGGETIM_IDX(var, reg, field, idx)				\
-	 __REGGET(var, reg ## _ ## field((idx))) /			\
+	 __REGGET(var, reg ## _ ## field((idx))) / 			\
 	 __REGSHIFT(reg ## _ ## field((idx)))
 
 #else
 
 #  define __REG(x)	io_p2v(x)
-#  define __REG2(x, y)	io_p2v((x) + 4 * (y))
+#  define __REG2(x, y)	io_p2v((x) + (y))
 
 #endif
 

diff --git a/trunk/include/asm-arm/kexec.h b/trunk/include/asm-arm/kexec.h
@@ -14,8 +14,6 @@
 
 #define KEXEC_ARCH KEXEC_ARCH_ARM
 
-#define KEXEC_BOOT_PARAMS_SIZE 1536
-
 #define KEXEC_ARM_ATAGS_OFFSET  0x1000
 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000