summaryrefslogtreecommitdiff
path: root/target/linux/x86/patches-2.6.30/300-block2mtd_init.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-03 01:12:48 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-03 01:12:48 +0000
commit78015b1b6d9d91f7ccb3f58531f63e3fc498a332 (patch)
treea2ae3be0f2e75282c0f785e0a8eeedccfab48b68 /target/linux/x86/patches-2.6.30/300-block2mtd_init.patch
parentb8f6c2dc9e0013ccf9c052c64193da96a8355610 (diff)
[x86] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18281 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/patches-2.6.30/300-block2mtd_init.patch')
-rw-r--r--target/linux/x86/patches-2.6.30/300-block2mtd_init.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/x86/patches-2.6.30/300-block2mtd_init.patch b/target/linux/x86/patches-2.6.30/300-block2mtd_init.patch
index 12165b52b5..c09432e282 100644
--- a/target/linux/x86/patches-2.6.30/300-block2mtd_init.patch
+++ b/target/linux/x86/patches-2.6.30/300-block2mtd_init.patch
@@ -69,7 +69,7 @@
static struct page *page_read(struct address_space *mapping, int index)
{
-@@ -510,7 +542,9 @@ static int block2mtd_setup2(const char *
+@@ -511,7 +543,9 @@ static int block2mtd_setup2(const char *
if (token[2] && (strlen(token[2]) + 1 > 80))
parse_err("mtd device name too long");
@@ -82,7 +82,7 @@
}
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
-@@ -447,12 +447,14 @@
+@@ -474,12 +474,14 @@
*(.initcall4s.init) \
*(.initcall5.init) \
*(.initcall5s.init) \
@@ -151,7 +151,7 @@
static int kernel_init(void *);
-@@ -752,12 +753,13 @@ int do_one_initcall(initcall_t fn)
+@@ -753,12 +754,13 @@ int do_one_initcall(initcall_t fn)
extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
@@ -167,7 +167,7 @@
do_one_initcall(*call);
/* Make sure there is no pending stuff from the initcall sequence */
-@@ -779,7 +781,7 @@ static void __init do_basic_setup(void)
+@@ -780,7 +782,7 @@ static void __init do_basic_setup(void)
usermodehelper_init();
driver_init();
init_irq_proc();
@@ -176,7 +176,7 @@
}
static void __init do_pre_smp_initcalls(void)
-@@ -840,6 +842,13 @@ static noinline int init_post(void)
+@@ -841,6 +843,13 @@ static noinline int init_post(void)
panic("No init found. Try passing init= option to kernel.");
}
@@ -190,7 +190,7 @@
static int __init kernel_init(void * unused)
{
lock_kernel();
-@@ -879,7 +888,16 @@ static int __init kernel_init(void * unu
+@@ -880,7 +889,16 @@ static int __init kernel_init(void * unu
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL;