EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove initrd code leftovers. Also fixes "Bad page state" on boot (kernel tried to free initramfs twice).

Browse Source 
SVN-Revision: 6613
This commit is contained in:
Eugene Konev 2007-03-19 17:25:06 +00:00
parent 62c5b1c4ef
commit f04dd67969
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/ar7-2.6/config/default
View File

@ -7,6 +7,7 @@ CONFIG_AR7_WDT=y
# CONFIG_ATMEL is not set # CONFIG_ATMEL is not set
CONFIG_BASE_SMALL=0 CONFIG_BASE_SMALL=0
# CONFIG_BCM43XX is not set # CONFIG_BCM43XX is not set
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_BOOT_ELF32=y CONFIG_BOOT_ELF32=y
CONFIG_CMDLINE="console=ttyS0,38400n8r root=/dev/mtdblock3 init=/etc/preinit" CONFIG_CMDLINE="console=ttyS0,38400n8r root=/dev/mtdblock3 init=/etc/preinit"
CONFIG_CPMAC=y CONFIG_CPMAC=y

8
target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
View File

@ -25,7 +25,6 @@
*/ */
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/initrd.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pfn.h> #include <linux/pfn.h>
@ -68,8 +67,6 @@ static int __init memsize(void)
return result; return result;
} }
extern unsigned long __initramfs_start, __initramfs_end;
#ifdef CONFIG_NEED_MULTIPLE_NODES #ifdef CONFIG_NEED_MULTIPLE_NODES
static bootmem_data_t node_bootmem_data; static bootmem_data_t node_bootmem_data;
pg_data_t __node_data[1] = { pg_data_t __node_data[1] = {
@ -176,11 +173,6 @@ void __init prom_meminit(void)
unsigned long bootmap_size; unsigned long bootmap_size;
#endif #endif
#ifdef CONFIG_BLK_DEV_INITRD
initrd_start = (unsigned long)&__initramfs_start;
initrd_end = (unsigned long)&__initramfs_end;
#endif
pages = memsize() >> PAGE_SHIFT; pages = memsize() >> PAGE_SHIFT;
add_memory_region(ARCH_PFN_OFFSET << PAGE_SHIFT, pages << add_memory_region(ARCH_PFN_OFFSET << PAGE_SHIFT, pages <<
PAGE_SHIFT, BOOT_MEM_RAM); PAGE_SHIFT, BOOT_MEM_RAM);