From: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Date: Thu, 21 Feb 2008 15:30:10 +0000 (+0100)
Subject: There is no need to have BOOT_PARAMS_SIZE known outside of atags.c
X-Git-Tag: v2.6.27-rc1~850^2~3^2^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff7f2a46bd8831e1f1f2a694ec13921720180b7;p=linux-2.6

There is no need to have BOOT_PARAMS_SIZE known outside of atags.c

atags.c was the only user of KEXEC_BOOT_PARAMS_SIZE and kexec.h
was only included to get that definition.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Acked-by: Uli Luckas <u.luckas@road.de>
---

diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c
index 64c420805e..56fef9a055 100644
--- a/arch/arm/kernel/atags.c
+++ b/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/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
index 47fe34d692..c8986bb99e 100644
--- a/include/asm-arm/kexec.h
+++ b/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