diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-19 12:43:59 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-19 12:43:59 +0000 |
commit | 5a446cf2d810fef6cc21b395548158e6d1e4ba27 (patch) | |
tree | 27155ec2bb3ddc4a6be8088203bb03abac6e1605 /target/linux/generic | |
parent | 8fc278904ec5cb04fdac7ebec44154a5fb9f64a5 (diff) |
[kernel] update to 2.6.37.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25577 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch b/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch index 2af46a9650..18f0c4e512 100644 --- a/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch +++ b/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch @@ -105,7 +105,7 @@ { --- a/fs/partitions/check.c +++ b/fs/partitions/check.c -@@ -707,6 +707,7 @@ rescan: +@@ -715,6 +715,7 @@ rescan: kfree(state); return 0; } diff --git a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch index 45a096d873..3725b922ce 100644 --- a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch @@ -17,7 +17,7 @@ port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); -@@ -1388,3 +1389,5 @@ MODULE_LICENSE("GPL"); +@@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch index 35b9b925fb..8d8638be31 100644 --- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch @@ -76,7 +76,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4773,6 +4773,7 @@ int can_nice(const struct task_struct *p +@@ -4776,6 +4776,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } |