.33 patches

6 files changed, 211 insertions, 0 deletions

diff --git a/queue-2.6.33/kcore-fix-test-for-end-of-list.patch b/queue-2.6.33/kcore-fix-test-for-end-of-list.patch
new file mode 100644
index 0000000..dd7560e
--- /dev/null
+++ b/queue-2.6.33/kcore-fix-test-for-end-of-list.patch
@@ -0,0 +1,35 @@
+From 4fd2c20d964a8fb9861045f1022475c9d200d684 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <error27@gmail.com>
+Date: Tue, 23 Mar 2010 13:35:42 -0700
+Subject: kcore: fix test for end of list
+
+From: Dan Carpenter <error27@gmail.com>
+
+commit 4fd2c20d964a8fb9861045f1022475c9d200d684 upstream.
+
+"m" is never NULL here.  We need a different test for the end of list
+condition.
+
+Signed-off-by: Dan Carpenter <error27@gmail.com>
+Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Leonardo Chiquitto <leonardo.lists@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/proc/kcore.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/proc/kcore.c
++++ b/fs/proc/kcore.c
+@@ -490,7 +490,7 @@ read_kcore(struct file *file, char __use
+ 		}
+ 		read_unlock(&kclist_lock);
+ 
+-		if (m == NULL) {
++		if (&m->list == &kclist_head) {
+ 			if (clear_user(buffer, tsz))
+ 				return -EFAULT;
+ 		} else if (is_vmalloc_or_module_addr((void *)start)) {
diff --git a/queue-2.6.33/revert-mips-mtx-1-make-au1000_eth-probe-all-phy.patch b/queue-2.6.33/revert-mips-mtx-1-make-au1000_eth-probe-all-phy.patch
new file mode 100644
index 0000000..5064b7a
--- /dev/null
+++ b/queue-2.6.33/revert-mips-mtx-1-make-au1000_eth-probe-all-phy.patch
@@ -0,0 +1,48 @@
+From florian@openwrt.org  Wed Nov  2 14:06:55 2011
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 17 Oct 2011 19:43:06 +0200
+Subject: Revert "MIPS: MTX-1: Make au1000_eth probe all PHY
+To: ralf@linux-mips.org, linux-mips@linux-mips.org, Greg KH <gregkh@suse.de>
+Message-ID: <201110171943.06143.florian@openwrt.org>
+
+From: Florian Fainelli <florian@openwrt.org>
+
+Commit 34dce55d was not applicable in 2.6.33 and introduces a build breakage.
+Revert that commit since it is irrelevant for this kernel version.
+
+Acked-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+
+---
+ arch/mips/alchemy/mtx-1/platform.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+--- a/arch/mips/alchemy/mtx-1/platform.c
++++ b/arch/mips/alchemy/mtx-1/platform.c
+@@ -28,8 +28,6 @@
+ #include <linux/mtd/physmap.h>
+ #include <mtd/mtd-abi.h>
+ 
+-#include <asm/mach-au1x00/au1xxx_eth.h>
+-
+ static struct gpio_keys_button mtx1_gpio_button[] = {
+ 	{
+ 		.gpio = 207,
+@@ -142,17 +140,10 @@ static struct __initdata platform_device
+ 	&mtx1_mtd,
+ };
+ 
+-static struct au1000_eth_platform_data mtx1_au1000_eth0_pdata = {
+-	.phy_search_highest_addr	= 1,
+-	.phy1_search_mac0 		= 1,
+-};
+-
+ static int __init mtx1_register_devices(void)
+ {
+ 	int rc;
+ 
+-	au1xxx_override_eth_cfg(0, &mtx1_au1000_eth0_pdata);
+-
+ 	rc = gpio_request(mtx1_gpio_button[0].gpio,
+ 					mtx1_gpio_button[0].desc);
+ 	if (rc < 0) {
diff --git a/queue-2.6.33/revert-usb-musb-restore-index-register-in-resume-path.patch b/queue-2.6.33/revert-usb-musb-restore-index-register-in-resume-path.patch
new file mode 100644
index 0000000..cc78bcf
--- /dev/null
+++ b/queue-2.6.33/revert-usb-musb-restore-index-register-in-resume-path.patch
@@ -0,0 +1,32 @@
+rom c7552a202dea01d2861f0a1629edb362f78a029d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Wed, 2 Nov 2011 14:04:11 -0700
+Subject: Revert "usb: musb: restore INDEX register in resume path"
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+This reverts commit 5aa8a93b5d44724f1f63357b300eca208fb069d0.
+
+Turns out this breaks the build, and as such, really isn't needed for
+the 2.6.33-stable branch at all.
+
+Reported-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
+Cc: Anand Gadiyar <gadiyar@ti.com>
+Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
+Cc: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/musb/musb_core.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -1640,7 +1640,6 @@ void musb_dma_completion(struct musb *mu
+ 			}
+ 		}
+ 	}
+-	musb_writeb(musb_base, MUSB_INDEX, musb->context.index);
+ }
+ 
+ #else
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index cbeefac..ae66e17 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -86,3 +86,8 @@ plat-mxc-iomux-v3.h-implicitly-enable-pull-up-down-when-that-s-desired.patch
 net-fix-a-memmove-bug-in-dev_gro_receive.patch
 gro-fix-different-skb-headrooms.patch
 gro-re-fix-different-skb-headrooms.patch
+revert-mips-mtx-1-make-au1000_eth-probe-all-phy.patch
+revert-usb-musb-restore-index-register-in-resume-path.patch
+watchdog-mtx1-wdt-fix-build-failure.patch
+kcore-fix-test-for-end-of-list.patch
+thinkpad-acpi-module-autoloading-for-newer-lenovo-thinkpads.patch
diff --git a/queue-2.6.33/thinkpad-acpi-module-autoloading-for-newer-lenovo-thinkpads.patch b/queue-2.6.33/thinkpad-acpi-module-autoloading-for-newer-lenovo-thinkpads.patch
new file mode 100644
index 0000000..7dfcc77
--- /dev/null
+++ b/queue-2.6.33/thinkpad-acpi-module-autoloading-for-newer-lenovo-thinkpads.patch
@@ -0,0 +1,51 @@
+From bjorn@mork.no  Wed Nov  2 14:11:41 2011
+From: Manoj Iyer <manoj.iyer@canonical.com>
+Date: Thu, 20 Oct 2011 20:50:25 +0200
+Subject: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
+To: stable@vger.kernel.org
+Cc: Manoj Iyer <manoj.iyer@canonical.com>, Andy Lutomirski <luto@mit.edu>, Matthew Garrett <mjg@redhat.com>
+Message-ID: <1319136625-29820-1-git-send-email-bjorn@mork.no>
+
+From: Manoj Iyer <manoj.iyer@canonical.com>
+
+commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream.
+
+The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead
+of IBM0068. Added new HID so that thinkpad_acpi module will
+auto load on these newer Lenovo ThinkPads.
+
+Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
+Cc: stable@vger.kernel.org
+Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
+Signed-off-by: Andy Lutomirski <luto@mit.edu>
+Signed-off-by: Matthew Garrett <mjg@redhat.com>
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/platform/x86/thinkpad_acpi.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -122,7 +122,9 @@ enum {
+ };
+ 
+ /* ACPI HIDs */
+-#define TPACPI_ACPI_HKEY_HID		"IBM0068"
++#define TPACPI_ACPI_IBM_HKEY_HID	"IBM0068"
++#define TPACPI_ACPI_LENOVO_HKEY_HID	"LEN0068"
++#define TPACPI_ACPI_EC_HID		"PNP0C09"
+ 
+ /* Input IDs */
+ #define TPACPI_HKEY_INPUT_PRODUCT	0x5054 /* "TP" */
+@@ -3849,7 +3851,8 @@ errexit:
+ }
+ 
+ static const struct acpi_device_id ibm_htk_device_ids[] = {
+-	{TPACPI_ACPI_HKEY_HID, 0},
++	{TPACPI_ACPI_IBM_HKEY_HID, 0},
++	{TPACPI_ACPI_LENOVO_HKEY_HID, 0},
+ 	{"", 0},
+ };
+ 
diff --git a/queue-2.6.33/watchdog-mtx1-wdt-fix-build-failure.patch b/queue-2.6.33/watchdog-mtx1-wdt-fix-build-failure.patch
new file mode 100644
index 0000000..a3a1e52
--- /dev/null
+++ b/queue-2.6.33/watchdog-mtx1-wdt-fix-build-failure.patch
@@ -0,0 +1,40 @@
+From florian@openwrt.org  Wed Nov  2 14:09:31 2011
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 17 Oct 2011 19:47:44 +0200
+Subject: watchdog: mtx1-wdt: fix build failure
+To: Wim Van Sebroeck <wim@iguana.be>, Greg KH <gregkh@suse.de>, linux-watchdog@vger.kernel.org
+Message-ID: <201110171947.44673.florian@openwrt.org>
+
+From: Florian Fainelli <florian@openwrt.org>
+
+Commit 72b6e8a847 (watchdog: mtx1-wdt: request gpio before using it) was
+backported from upstream. The patch is using a gpiolib call which is only
+available in kernel 2.6.34+. Fix build by using the "old" gpiolib API
+instead.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/watchdog/mtx-1_wdt.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/watchdog/mtx-1_wdt.c
++++ b/drivers/watchdog/mtx-1_wdt.c
+@@ -211,13 +211,14 @@ static int __devinit mtx1_wdt_probe(stru
+ 	int ret;
+ 
+ 	mtx1_wdt_device.gpio = pdev->resource[0].start;
+-	ret = gpio_request_one(mtx1_wdt_device.gpio,
+-				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
++	ret = gpio_request(mtx1_wdt_device.gpio, "mtx1-wdt");
+ 	if (ret < 0) {
+ 		dev_err(&pdev->dev, "failed to request gpio");
+ 		return ret;
+ 	}
+ 
++	gpio_direction_output(mtx1_wdt_device.gpio, 1);
++
+ 	spin_lock_init(&mtx1_wdt_device.lock);
+ 	init_completion(&mtx1_wdt_device.stop);
+ 	mtx1_wdt_device.queue = 0;