Explorar o código

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>
Uwe Kleine-König %!s(int64=17) %!d(string=hai) anos
pai
achega
8ff7f2a46b
Modificáronse 2 ficheiros con 3 adicións e 6 borrados
  1. 3 4
      arch/arm/kernel/atags.c
  2. 0 2
      include/asm-arm/kexec.h

+ 3 - 4
arch/arm/kernel/atags.c

@@ -1,5 +1,4 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
-#include <linux/kexec.h>
 #include <linux/proc_fs.h>
 #include <linux/proc_fs.h>
 #include <asm/setup.h>
 #include <asm/setup.h>
 #include <asm/types.h>
 #include <asm/types.h>
@@ -42,14 +41,14 @@ create_proc_entries(void)
 	return 0;
 	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;
 static char __initdata *atags_copy;
 
 
 void __init save_atags(const struct tag *tags)
 void __init save_atags(const struct tag *tags)
 {
 {
 	atags_copy = atags_copy_buf;
 	atags_copy = atags_copy_buf;
-	memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE);
+	memcpy(atags_copy, tags, sizeof(atags_copy_buf));
 }
 }
 
 
 
 

+ 0 - 2
include/asm-arm/kexec.h

@@ -14,8 +14,6 @@
 
 
 #define KEXEC_ARCH KEXEC_ARCH_ARM
 #define KEXEC_ARCH KEXEC_ARCH_ARM
 
 
-#define KEXEC_BOOT_PARAMS_SIZE 1536
-
 #define KEXEC_ARM_ATAGS_OFFSET  0x1000
 #define KEXEC_ARM_ATAGS_OFFSET  0x1000
 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000