Skip to content

Commit

Permalink
sh: Kill off legacy embedded ramdisk section.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Oct 30, 2007
1 parent 7e5186e commit 3f9654f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
15 changes: 1 addition & 14 deletions arch/sh/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)) {
Expand Down
8 changes: 0 additions & 8 deletions arch/sh/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 3f9654f

Please sign in to comment.