qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 02:48:37 +02:00
Code

[x86] add again missing hunk in vmlinux.lds.S

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18337 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-11-07 13:36:32 +00:00
parent d076b12052
commit 1fa447544a
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/linux/x86/patches-2.6.31/300-block2mtd_init.patch
View File

@ -1,7 +1,24 @@
Index: linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S
===================================================================
--- linux-2.6.31.5.orig/arch/x86/kernel/vmlinux.lds.S 2009-10-23 00:57:56.000000000 +0200
+++ linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S 2009-11-07 14:31:54.000000000 +0100
@@ -244,6 +244,12 @@
__initcall_end = .;
}
+ .root_initcall.init : AT(ADDR(.root_initcall.init) - LOAD_OFFSET) {
+ __root_initcall_start = .;
+ INITCALLS_ROOT
+ __root_initcall_end = .;
+ }
+
.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
__con_initcall_start = .;
*(.con_initcall.init)
Index: linux-2.6.31.5/drivers/mtd/devices/block2mtd.c
===================================================================
--- linux-2.6.31.5.orig/drivers/mtd/devices/block2mtd.c 2009-11-07 13:52:05.000000000 +0100
+++ linux-2.6.31.5/drivers/mtd/devices/block2mtd.c 2009-11-07 13:52:17.000000000 +0100
--- linux-2.6.31.5.orig/drivers/mtd/devices/block2mtd.c 2009-11-07 14:30:57.000000000 +0100
+++ linux-2.6.31.5/drivers/mtd/devices/block2mtd.c 2009-11-07 14:31:19.000000000 +0100
@@ -18,10 +18,18 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
@ -69,8 +86,8 @@ Index: linux-2.6.31.5/drivers/mtd/devices/block2mtd.c
}
Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
===================================================================
--- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h 2009-11-07 13:52:04.000000000 +0100
+++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 2009-11-07 13:52:17.000000000 +0100
--- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h 2009-11-07 14:30:57.000000000 +0100
+++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 2009-11-07 14:31:19.000000000 +0100
@@ -622,12 +622,14 @@
*(.initcall4s.init) \
*(.initcall5.init) \
@ -90,7 +107,7 @@ Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
Index: linux-2.6.31.5/init/do_mounts.c
===================================================================
--- linux-2.6.31.5.orig/init/do_mounts.c 2009-10-23 00:57:56.000000000 +0200
+++ linux-2.6.31.5/init/do_mounts.c 2009-11-07 13:52:17.000000000 +0100
+++ linux-2.6.31.5/init/do_mounts.c 2009-11-07 14:31:19.000000000 +0100
@@ -176,16 +176,8 @@
return 1;
}
@ -134,8 +151,8 @@ Index: linux-2.6.31.5/init/do_mounts.c
if (!strncmp(root_device_name, "mtd", 3) ||
Index: linux-2.6.31.5/init/main.c
===================================================================
--- linux-2.6.31.5.orig/init/main.c 2009-11-07 13:52:16.000000000 +0100
+++ linux-2.6.31.5/init/main.c 2009-11-07 14:00:29.000000000 +0100
--- linux-2.6.31.5.orig/init/main.c 2009-11-07 14:30:59.000000000 +0100
+++ linux-2.6.31.5/init/main.c 2009-11-07 14:31:19.000000000 +0100
@@ -79,6 +79,7 @@
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/smp.h>