Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9654f0 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7e5186ea

arch/sh/kernel/setup.c

+1 −14
Original line number Diff line number Diff line
@@ -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)) {

arch/sh/kernel/vmlinux.lds.S

+0 −8
Original line number Diff line number Diff line
@@ -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

	}