diff options
| author | Eugene Konev <ejka@imfi.kspu.ru> | 2007-03-19 17:25:06 +0000 |
|---|---|---|
| committer | Eugene Konev <ejka@imfi.kspu.ru> | 2007-03-19 17:25:06 +0000 |
| commit | f04dd67969a38e54002c20828acf93090c4d10a4 (patch) | |
| tree | 3b95e8fa63d2f96b6551d9576dd7c6400c17c148 | |
| parent | 62c5b1c4eff59959c895bfce42974f0c09d6c4c3 (diff) | |
| download | upstream-f04dd67969a38e54002c20828acf93090c4d10a4.tar.gz upstream-f04dd67969a38e54002c20828acf93090c4d10a4.tar.bz2 upstream-f04dd67969a38e54002c20828acf93090c4d10a4.zip | |
Remove initrd code leftovers. Also fixes "Bad page state" on boot (kernel tried to free initramfs twice).
SVN-Revision: 6613
| -rw-r--r-- | target/linux/ar7-2.6/config/default | 1 | ||||
| -rw-r--r-- | target/linux/ar7-2.6/files/arch/mips/ar7/memory.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7-2.6/config/default index ca12194201..888a446ee0 100644 --- a/target/linux/ar7-2.6/config/default +++ b/target/linux/ar7-2.6/config/default @@ -7,6 +7,7 @@ CONFIG_AR7_WDT=y # CONFIG_ATMEL is not set CONFIG_BASE_SMALL=0 # CONFIG_BCM43XX is not set +# CONFIG_BLK_DEV_INITRD is not set CONFIG_BOOT_ELF32=y CONFIG_CMDLINE="console=ttyS0,38400n8r root=/dev/mtdblock3 init=/etc/preinit" CONFIG_CPMAC=y diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c index ea5b5bee77..17cb740b3f 100644 --- a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c +++ b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c @@ -25,7 +25,6 @@ */ #include <linux/bootmem.h> #include <linux/init.h> -#include <linux/initrd.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/pfn.h> @@ -68,8 +67,6 @@ static int __init memsize(void) return result; } -extern unsigned long __initramfs_start, __initramfs_end; - #ifdef CONFIG_NEED_MULTIPLE_NODES static bootmem_data_t node_bootmem_data; pg_data_t __node_data[1] = { @@ -176,11 +173,6 @@ void __init prom_meminit(void) unsigned long bootmap_size; #endif -#ifdef CONFIG_BLK_DEV_INITRD - initrd_start = (unsigned long)&__initramfs_start; - initrd_end = (unsigned long)&__initramfs_end; -#endif - pages = memsize() >> PAGE_SHIFT; add_memory_region(ARCH_PFN_OFFSET << PAGE_SHIFT, pages << PAGE_SHIFT, BOOT_MEM_RAM); |