aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/setup.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-10-30 04:25:29 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-10-30 04:25:29 -0400
commit3f9654f02ede996e5be73866da716b325a6fb66b (patch)
treee4254f270353b0b2341452d56cac6665c162c024 /arch/sh/kernel/setup.c
parent7e5186eaae8eebc0101d539791dbff92256455ee (diff)
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/kernel/setup.c')
-rw-r--r--arch/sh/kernel/setup.c15
1 files changed, 1 insertions, 14 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 @@
32#include <asm/clock.h> 32#include <asm/clock.h>
33#include <asm/mmu_context.h> 33#include <asm/mmu_context.h>
34 34
35extern void * __rd_start, * __rd_end;
36
37/*
38 * Machine setup..
39 */
40
41/* 35/*
42 * Initialize loops_per_jiffy as 10000000 (1000MIPS). 36 * Initialize loops_per_jiffy as 10000000 (1000MIPS).
43 * This value will be used at the very early stage of serial setup. 37 * 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)
194 sparse_memory_present_with_active_regions(0); 188 sparse_memory_present_with_active_regions(0);
195 189
196#ifdef CONFIG_BLK_DEV_INITRD 190#ifdef CONFIG_BLK_DEV_INITRD
197 ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); 191 ROOT_DEV = Root_RAM0;
198 if (&__rd_start != &__rd_end) {
199 LOADER_TYPE = 1;
200 INITRD_START = PHYSADDR((unsigned long)&__rd_start) -
201 __MEMORY_START;
202 INITRD_SIZE = (unsigned long)&__rd_end -
203 (unsigned long)&__rd_start;
204 }
205 192
206 if (LOADER_TYPE && INITRD_START) { 193 if (LOADER_TYPE && INITRD_START) {
207 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { 194 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {