aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-03 01:12:48 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-03 01:12:48 +0000
commitd6c8f9b9f57ee4caf41521d592c497a4e4b27311 (patch)
treec154a2e12b2b495dcd6a567803e31173cb24523e /target/linux
parent49903fa563662a9cbe54da16f9ca0be4cce6dd4c (diff)
downloadupstream-d6c8f9b9f57ee4caf41521d592c497a4e4b27311.tar.gz
upstream-d6c8f9b9f57ee4caf41521d592c497a4e4b27311.tar.bz2
upstream-d6c8f9b9f57ee4caf41521d592c497a4e4b27311.zip
refresh kernel patches
SVN-Revision: 18281
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch2
-rw-r--r--target/linux/x86/patches-2.6.30/300-block2mtd_init.patch12
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch b/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch
index 691d1ca852..066694b353 100644
--- a/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch
+++ b/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch
@@ -1,6 +1,6 @@
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ static int sc1200_init_one(struct pci_de
.port_ops = &sc1200_port_ops
};
/* Can't enable port 2 yet, see top comments */
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;