diff options
| -rw-r--r-- | arch/arm/kernel/atags.c | 7 | ||||
| -rw-r--r-- | include/asm-arm/kexec.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c index 64c420805e6f..56fef9a05504 100644 --- a/arch/arm/kernel/atags.c +++ b/arch/arm/kernel/atags.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include <linux/slab.h> | 1 | #include <linux/slab.h> |
| 2 | #include <linux/kexec.h> | ||
| 3 | #include <linux/proc_fs.h> | 2 | #include <linux/proc_fs.h> |
| 4 | #include <asm/setup.h> | 3 | #include <asm/setup.h> |
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| @@ -42,14 +41,14 @@ create_proc_entries(void) | |||
| 42 | return 0; | 41 | return 0; |
| 43 | } | 42 | } |
| 44 | 43 | ||
| 45 | 44 | #define BOOT_PARAMS_SIZE 1536 | |
| 46 | static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE]; | 45 | static char __initdata atags_copy_buf[BOOT_PARAMS_SIZE]; |
| 47 | static char __initdata *atags_copy; | 46 | static char __initdata *atags_copy; |
| 48 | 47 | ||
| 49 | void __init save_atags(const struct tag *tags) | 48 | void __init save_atags(const struct tag *tags) |
| 50 | { | 49 | { |
| 51 | atags_copy = atags_copy_buf; | 50 | atags_copy = atags_copy_buf; |
| 52 | memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE); | 51 | memcpy(atags_copy, tags, sizeof(atags_copy_buf)); |
| 53 | } | 52 | } |
| 54 | 53 | ||
| 55 | 54 | ||
diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h index 47fe34d692da..c8986bb99ed5 100644 --- a/include/asm-arm/kexec.h +++ b/include/asm-arm/kexec.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define KEXEC_ARCH KEXEC_ARCH_ARM | 15 | #define KEXEC_ARCH KEXEC_ARCH_ARM |
| 16 | 16 | ||
| 17 | #define KEXEC_BOOT_PARAMS_SIZE 1536 | ||
| 18 | |||
| 19 | #define KEXEC_ARM_ATAGS_OFFSET 0x1000 | 17 | #define KEXEC_ARM_ATAGS_OFFSET 0x1000 |
| 20 | #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 | 18 | #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 |
| 21 | 19 | ||
