mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-24 22:26:26 +03:00
[x86] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18281 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
b8f6c2dc9e
commit
78015b1b6d
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/ata/pata_sc1200.c
|
--- a/drivers/ata/pata_sc1200.c
|
||||||
+++ b/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
|
.port_ops = &sc1200_port_ops
|
||||||
};
|
};
|
||||||
/* Can't enable port 2 yet, see top comments */
|
/* Can't enable port 2 yet, see top comments */
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
|
|
||||||
static struct page *page_read(struct address_space *mapping, int index)
|
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))
|
if (token[2] && (strlen(token[2]) + 1 > 80))
|
||||||
parse_err("mtd device name too long");
|
parse_err("mtd device name too long");
|
||||||
|
|
||||||
@ -82,7 +82,7 @@
|
|||||||
}
|
}
|
||||||
--- a/include/asm-generic/vmlinux.lds.h
|
--- a/include/asm-generic/vmlinux.lds.h
|
||||||
+++ b/include/asm-generic/vmlinux.lds.h
|
+++ b/include/asm-generic/vmlinux.lds.h
|
||||||
@@ -447,12 +447,14 @@
|
@@ -474,12 +474,14 @@
|
||||||
*(.initcall4s.init) \
|
*(.initcall4s.init) \
|
||||||
*(.initcall5.init) \
|
*(.initcall5.init) \
|
||||||
*(.initcall5s.init) \
|
*(.initcall5s.init) \
|
||||||
@ -151,7 +151,7 @@
|
|||||||
|
|
||||||
static int kernel_init(void *);
|
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[];
|
extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
|
||||||
@ -167,7 +167,7 @@
|
|||||||
do_one_initcall(*call);
|
do_one_initcall(*call);
|
||||||
|
|
||||||
/* Make sure there is no pending stuff from the initcall sequence */
|
/* 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();
|
usermodehelper_init();
|
||||||
driver_init();
|
driver_init();
|
||||||
init_irq_proc();
|
init_irq_proc();
|
||||||
@ -176,7 +176,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void __init do_pre_smp_initcalls(void)
|
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.");
|
panic("No init found. Try passing init= option to kernel.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -190,7 +190,7 @@
|
|||||||
static int __init kernel_init(void * unused)
|
static int __init kernel_init(void * unused)
|
||||||
{
|
{
|
||||||
lock_kernel();
|
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) {
|
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
|
||||||
ramdisk_execute_command = NULL;
|
ramdisk_execute_command = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user