---

yaml
---
r: 73073
b: refs/heads/master
c: 3f9654f
h: refs/heads/master
i:
  73071: 2d7c3e9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e5186eaae8eebc0101d539791dbff92256455ee
+refs/heads/master: 3f9654f02ede996e5be73866da716b325a6fb66b

trunk/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)) {

trunk/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
 	}