diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-10-30 17:32:08 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-10-30 17:32:08 +0900 |
commit | 69d1ef4caf77da7164d3e392bf0a8057b42cf26e (patch) | |
tree | fe668f08b4f4cdbfdd17768a4b92dd5d76f19658 | |
parent | 2278caa3c850c8f0aac4e1db7649a2c90cdaa9e9 (diff) | |
download | op-kernel-dev-69d1ef4caf77da7164d3e392bf0a8057b42cf26e.zip op-kernel-dev-69d1ef4caf77da7164d3e392bf0a8057b42cf26e.tar.gz |
sh: Move zero page param defs somewhere sensible.
Follows s390 and others.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/setup.c | 25 | ||||
-rw-r--r-- | include/asm-sh/setup.h | 14 |
2 files changed, 23 insertions, 16 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index c439a7e..0b8c45d 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -57,28 +57,21 @@ struct screen_info screen_info; extern int root_mountflags; -/* - * This is set up by the setup-routine at boot-time - */ -#define PARAM ((unsigned char *)empty_zero_page) - -#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000)) -#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004)) -#define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008)) -#define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c)) -#define INITRD_START (*(unsigned long *) (PARAM+0x010)) -#define INITRD_SIZE (*(unsigned long *) (PARAM+0x014)) -/* ... */ -#define COMMAND_LINE ((char *) (PARAM+0x100)) - #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000 #define RAMDISK_LOAD_FLAG 0x4000 static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, }; -static struct resource code_resource = { .name = "Kernel code", }; -static struct resource data_resource = { .name = "Kernel data", }; +static struct resource code_resource = { + .name = "Kernel code", + .flags = IORESOURCE_BUSY | IORESOURCE_MEM, +}; + +static struct resource data_resource = { + .name = "Kernel data", + .flags = IORESOURCE_BUSY | IORESOURCE_MEM, +}; unsigned long memory_start; EXPORT_SYMBOL(memory_start); diff --git a/include/asm-sh/setup.h b/include/asm-sh/setup.h index 586a971..55a2bd3 100644 --- a/include/asm-sh/setup.h +++ b/include/asm-sh/setup.h @@ -5,6 +5,20 @@ #ifdef __KERNEL__ +/* + * This is set up by the setup-routine at boot-time + */ +#define PARAM ((unsigned char *)empty_zero_page) + +#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000)) +#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004)) +#define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008)) +#define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c)) +#define INITRD_START (*(unsigned long *) (PARAM+0x010)) +#define INITRD_SIZE (*(unsigned long *) (PARAM+0x014)) +/* ... */ +#define COMMAND_LINE ((char *) (PARAM+0x100)) + int setup_early_printk(char *); void sh_mv_setup(void); |