diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-10-30 09:25:29 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-10-30 09:25:29 +0100 |
| commit | 3f9654f02ede996e5be73866da716b325a6fb66b (patch) | |
| tree | e4254f270353b0b2341452d56cac6665c162c024 /arch/sh | |
| parent | sh: Fix up early mem cmdline parsing. (diff) | |
| download | linux-3f9654f02ede996e5be73866da716b325a6fb66b.tar.xz linux-3f9654f02ede996e5be73866da716b325a6fb66b.zip | |
sh: Kill off legacy embedded ramdisk section.
When the SH kernel used to support embedding a ramdisk in the
pre-initramfs days it was placed in a special section and made to
look like a regular initrd. Since that was removed ages ago, kill
off the remaining cruft that was missed.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/setup.c | 15 | ||||
| -rw-r--r-- | arch/sh/kernel/vmlinux.lds.S | 8 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index a031c6773906..c439a7ecd059 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -32,12 +32,6 @@ #include <asm/clock.h> #include <asm/mmu_context.h> -extern void * __rd_start, * __rd_end; - -/* - * Machine setup.. - */ - /* * Initialize loops_per_jiffy as 10000000 (1000MIPS). * This value will be used at the very early stage of serial setup. @@ -194,14 +188,7 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) sparse_memory_present_with_active_regions(0); #ifdef CONFIG_BLK_DEV_INITRD - ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); - if (&__rd_start != &__rd_end) { - LOADER_TYPE = 1; - INITRD_START = PHYSADDR((unsigned long)&__rd_start) - - __MEMORY_START; - INITRD_SIZE = (unsigned long)&__rd_end - - (unsigned long)&__rd_start; - } + ROOT_DEV = Root_RAM0; if (LOADER_TYPE && INITRD_START) { if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index 6d5abba2ee27..081147c401b6 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S @@ -43,14 +43,6 @@ SECTIONS .data : { /* Data */ DATA_DATA - - /* Align the initial ramdisk image (INITRD) on page boundaries. */ - . = ALIGN(PAGE_SIZE); - __rd_start = .; - *(.initrd) - . = ALIGN(PAGE_SIZE); - __rd_end = .; - CONSTRUCTORS } |