kernel: update linux 3.2 to 3.2.9

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30767 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 7 insertions, 101 deletions

diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index 379b16745..5605f9173 100644
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -1726,6 +1726,7 @@ CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NEW_LEDS=y
diff --git a/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch b/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch
deleted file mode 100644
index 212a7a517..000000000
--- a/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From df754e6af2f237a6c020c0daff55a1a609338e31 Mon Sep 17 00:00:00 2001
-From: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Date: Mon, 14 Nov 2011 13:13:49 +0100
-Subject: [PATCH 1/2] lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
-
-It's unlikely that TAINT_FIRMWARE_WORKAROUND causes false
-lockdep messages, so do not disable lockdep in that case.
-We still want to keep lockdep disabled in the
-TAINT_OOT_MODULE case:
-
-  - bin-only modules can cause various instabilities in
-    their and in unrelated kernel code
-
-  - they are impossible to debug for kernel developers
-
-  - they also typically do not have the copyright license
-    permission to link to the GPL-ed lockdep code.
-
-Suggested-by: Ben Hutchings <ben@decadent.org.uk>
-Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Link: http://lkml.kernel.org/n/tip-xopopjjens57r0i13qnyh2yo@git.kernel.org
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
----
- kernel/panic.c |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -240,8 +240,16 @@ void add_taint(unsigned flag)
- 	 * Also we want to keep up lockdep for staging development and
- 	 * post-warning case.
- 	 */
--	if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
--		printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
-+	switch (flag) {
-+	case TAINT_CRAP:
-+	case TAINT_WARN:
-+	case TAINT_FIRMWARE_WORKAROUND:
-+		break;
-+
-+	default:
-+		if (__debug_locks_off())
-+			printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
-+	}
- 
- 	set_bit(flag, &tainted_mask);
- }
diff --git a/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch b/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch
deleted file mode 100644
index 398bb3ed2..000000000
--- a/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9ec84acee1e221d99dc33237bff5e82839d10cc0 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 7 Dec 2011 14:30:58 +0000
-Subject: [PATCH 2/2] lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
-
-We do want to allow lock debugging for GPL-compatible modules
-that are not (yet) built in-tree.  This was disabled as a
-side-effect of commit 2449b8ba0745327c5fa49a8d9acffe03b2eded69
-('module,bug: Add TAINT_OOT_MODULE flag for modules not built
-in-tree').  Lock debug warnings now include taint flags, so
-kernel developers should still be able to deflect warnings
-caused by out-of-tree modules.
-
-The TAINT_PROPRIETARY_MODULE flag for non-GPL-compatible modules
-will still disable lock debugging.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Cc: Nick Bowler <nbowler@elliptictech.com>
-Cc: Greg KH <greg@kroah.com>
-Cc: Dave Jones <davej@redhat.com>
-Cc: Rusty Russell <rusty@rustcorp.com.au>
-Cc: Randy Dunlap <rdunlap@xenotime.net>
-Cc: Debian kernel maintainers <debian-kernel@lists.debian.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Alan Cox <alan@linux.intel.com>
-Link: http://lkml.kernel.org/r/1323268258.18450.11.camel@deadeye
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
----
- kernel/panic.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -237,11 +237,12 @@ void add_taint(unsigned flag)
- 	 * Can't trust the integrity of the kernel anymore.
- 	 * We don't call directly debug_locks_off() because the issue
- 	 * is not necessarily serious enough to set oops_in_progress to 1
--	 * Also we want to keep up lockdep for staging development and
--	 * post-warning case.
-+	 * Also we want to keep up lockdep for staging/out-of-tree
-+	 * development and post-warning case.
- 	 */
- 	switch (flag) {
- 	case TAINT_CRAP:
-+	case TAINT_OOT_MODULE:
- 	case TAINT_WARN:
- 	case TAINT_FIRMWARE_WORKAROUND:
- 		break;
diff --git a/target/linux/generic/patches-3.2/100-overlayfs_v11.patch b/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
index 8f80940f5..571a6c8ba 100644
--- a/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
@@ -3134,7 +3134,7 @@
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
-@@ -1481,6 +1487,11 @@ struct super_block {
+@@ -1482,6 +1488,11 @@ struct super_block {
  	int cleancache_poolid;
  
  	struct shrinker s_shrink;	/* per-sb shrinker handle */
@@ -3146,7 +3146,7 @@
  };
  
  /* superblock cache pruning functions */
-@@ -1638,6 +1649,7 @@ struct inode_operations {
+@@ -1639,6 +1650,7 @@ struct inode_operations {
  	void (*truncate_range)(struct inode *, loff_t, loff_t);
  	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
  		      u64 len);
@@ -3154,7 +3154,7 @@
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -2058,6 +2070,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2059,6 +2071,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, int);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
  				   const char *, int);
diff --git a/target/linux/generic/patches-3.2/202-reduce_module_size.patch b/target/linux/generic/patches-3.2/202-reduce_module_size.patch
index 58b4a7571..f1efb90c3 100644
--- a/target/linux/generic/patches-3.2/202-reduce_module_size.patch
+++ b/target/linux/generic/patches-3.2/202-reduce_module_size.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
diff --git a/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
index c0a478b70..4a7d351b6 100644
--- a/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
@@ -10,8 +10,8 @@
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
  	u16 cmd;
-@@ -877,3 +879,5 @@ static void __devinit quirk_usb_early_ha
- 		quirk_usb_handoff_xhci(pdev);
+@@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha
+ 	pci_disable_device(pdev);
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
 +