diff options
Diffstat (limited to 'arch')
-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 @@ | |||
32 | #include <asm/clock.h> | 32 | #include <asm/clock.h> |
33 | #include <asm/mmu_context.h> | 33 | #include <asm/mmu_context.h> |
34 | 34 | ||
35 | extern 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)) { |
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 | |||
43 | 43 | ||
44 | .data : { /* Data */ | 44 | .data : { /* Data */ |
45 | DATA_DATA | 45 | DATA_DATA |
46 | |||
47 | /* Align the initial ramdisk image (INITRD) on page boundaries. */ | ||
48 | . = ALIGN(PAGE_SIZE); | ||
49 | __rd_start = .; | ||
50 | *(.initrd) | ||
51 | . = ALIGN(PAGE_SIZE); | ||
52 | __rd_end = .; | ||
53 | |||
54 | CONSTRUCTORS | 46 | CONSTRUCTORS |
55 | } | 47 | } |
56 | 48 | ||