From 31ed958204328dc44dc074d29e6d0373716b1c22 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 19 Feb 2011 12:44:16 +0000 Subject: [kernel] update to 2.6.35.11 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25582 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch | 2 +- target/linux/generic/patches-2.6.35/240-packet_socket_type.patch | 4 ++-- .../linux/generic/patches-2.6.35/801-usb_serial_endpoint_size.patch | 6 +++--- target/linux/generic/patches-2.6.35/980-vm_exports.patch | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/generic/patches-2.6.35') diff --git a/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch index c00886e59..014bb256a 100644 --- a/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch +++ b/target/linux/generic/patches-2.6.35/040-arm-update-mach-types.patch @@ -81,7 +81,7 @@ htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391 htc_opal MACH_HTC_OPAL HTC_OPAL 2392 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 -@@ -2446,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 +@@ -2446,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 sm3k MACH_SM3K SM3K 2460 acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461 diff --git a/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch b/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch index 44117659a..7093031b1 100644 --- a/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch +++ b/target/linux/generic/patches-2.6.35/240-packet_socket_type.patch @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -2027,6 +2031,16 @@ packet_setsockopt(struct socket *sock, i +@@ -2030,6 +2034,16 @@ packet_setsockopt(struct socket *sock, i po->has_vnet_hdr = !!val; return 0; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -2084,6 +2098,13 @@ static int packet_getsockopt(struct sock +@@ -2087,6 +2101,13 @@ static int packet_getsockopt(struct sock data = &val; break; diff --git a/target/linux/generic/patches-2.6.35/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.35/801-usb_serial_endpoint_size.patch index cfbcbe88f..735c4e355 100644 --- a/target/linux/generic/patches-2.6.35/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.35/801-usb_serial_endpoint_size.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv +@@ -62,6 +62,7 @@ static struct usb_driver usb_serial_driv drivers depend on it. */ @@ -8,7 +8,7 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -912,7 +913,7 @@ int usb_serial_probe(struct usb_interfac +@@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac } buffer_size = serial->type->bulk_in_size; if (!buffer_size) @@ -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); -@@ -1382,3 +1383,5 @@ MODULE_LICENSE("GPL"); +@@ -1385,3 +1386,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.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch index 5ca94b25a..169bf4301 100644 --- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch @@ -48,7 +48,7 @@ { --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st +@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st return files; } @@ -56,7 +56,7 @@ void put_files_struct(struct files_struct *files) { -@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc +@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc rcu_read_unlock(); } } @@ -76,7 +76,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4262,6 +4262,7 @@ int can_nice(const struct task_struct *p +@@ -4390,6 +4390,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } -- cgit v1.2.3