update to kernel 2.6.36.4

SVN-Revision: 25580

14 files changed, 17 insertions, 17 deletions

diff --git a/target/linux/adm8668/Makefile b/target/linux/adm8668/Makefile
index 5980d9ef38..a60bb509b7 100644
--- a/target/linux/adm8668/Makefile
+++ b/target/linux/adm8668/Makefile
@@ -11,7 +11,7 @@ BOARD:=adm8668
 BOARDNAME:=Infineon WildPass ADM8668
 FEATURES:=squashfs
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 058b1a159e..139053aba2 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32
 FEATURES:=squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 14e25ffbc9..2ff0bcab57 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb pcmcia
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index db098e7861..e0205f74ab 100644
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks CNS21xx
 FEATURES:=squashfs broken
 CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile
index 90e71d2712..d7662441a9 100644
--- a/target/linux/ep93xx/Makefile
+++ b/target/linux/ep93xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cirrus Logic EP93xx
 FEATURES:=squashfs jffs2 ext4 targz usb
 CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/generic/patches-2.6.36/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.36/040-arm-update-mach-types.patch
index 9c90fc7d88..faea9a4fbf 100644
--- a/target/linux/generic/patches-2.6.36/040-arm-update-mach-types.patch
+++ b/target/linux/generic/patches-2.6.36/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.36/240-packet_socket_type.patch b/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch
index 204512ff11..f5cb465e93 100644
--- a/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch
+++ b/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -2054,6 +2058,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -2057,6 +2061,16 @@ packet_setsockopt(struct socket *sock, i
  		po->tp_tstamp = val;
  		return 0;
  	}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -2111,6 +2125,13 @@ static int packet_getsockopt(struct sock
+@@ -2114,6 +2128,13 @@ static int packet_getsockopt(struct sock
  
  		data = &val;
  		break;
diff --git a/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch
index dba6aaf434..361bf3dd07 100644
--- a/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic/patches-2.6.36/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);
-@@ -1376,3 +1377,5 @@ MODULE_LICENSE("GPL");
+@@ -1380,3 +1381,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.36/980-vm_exports.patch b/target/linux/generic/patches-2.6.36/980-vm_exports.patch
index d748b9b3f0..0ac0999f29 100644
--- a/target/linux/generic/patches-2.6.36/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.36/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
-@@ -4439,6 +4439,7 @@ int can_nice(const struct task_struct *p
+@@ -4567,6 +4567,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
diff --git a/target/linux/leon/Makefile b/target/linux/leon/Makefile
index eb3b83fcfe..34e206c286 100644
--- a/target/linux/leon/Makefile
+++ b/target/linux/leon/Makefile
@@ -14,7 +14,7 @@ FEATURES+=fpu tgz
 CFLAGS:=-Os -pipe -mcpu=v8 -funit-at-a-time
 KERNELNAME:="uImage"
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile
index 976a7be690..d0ba52cce3 100644
--- a/target/linux/mpc83xx/Makefile
+++ b/target/linux/mpc83xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=603e
 FEATURES:=squashfs targz broken
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 5488adc591..ef67446f93 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=8540
 FEATURES:=spe_fpu ramdisk broken
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 4bd2516049..f629170ecd 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x
 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
 FEATURES:=squashfs
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=kmod-leds-gpio wpad-mini
diff --git a/target/linux/sparc/Makefile b/target/linux/sparc/Makefile
index a444c33989..fe859ff2c8 100644
--- a/target/linux/sparc/Makefile
+++ b/target/linux/sparc/Makefile
@@ -11,7 +11,7 @@ BOARD:=sparc
 BOARDNAME:=Sun UltraSPARC
 FEATURES+=fpu tgz
 
-LINUX_VERSION:=2.6.36.2
+LINUX_VERSION:=2.6.36.4
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk