projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove initrd code leftovers. Also fixes "Bad page state" on boot
[openwrt.git]
/
target
/
linux
/
ar7-2.6
/
files
/
arch
/
mips
/
ar7
/
memory.c
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
ea5b5be
..
17cb740
100644
(file)
--- 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/bootmem.h>
#include <linux/init.h>
-#include <linux/initrd.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/pfn.h>
#include <linux/mm.h>
#include <linux/module.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
static bootmem_data_t node_bootmem_data;
pg_data_t __node_data[1] = {
#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
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);
pages = memsize() >> PAGE_SHIFT;
add_memory_region(ARCH_PFN_OFFSET << PAGE_SHIFT, pages <<
PAGE_SHIFT, BOOT_MEM_RAM);
This page took
0.021964 seconds
and
4
git commands to generate.