3.0-stable patches

added patches:
	media-smsusb-add-autodetection-support-for-usb-id-2040-f5a0.patch
	powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch

diff --git a/queue-3.0/media-smsusb-add-autodetection-support-for-usb-id-2040-f5a0.patch b/queue-3.0/media-smsusb-add-autodetection-support-for-usb-id-2040-f5a0.patch
new file mode 100644 (file)
index 0000000..2edc9bc
--- /dev/null
+++ b/queue-3.0/media-smsusb-add-autodetection-support-for-usb-id-2040-f5a0.patch
@@ -0,0 +1,28 @@
+From 3e1141e2ce5667301a74ca2ef396d9bd5e995f7f Mon Sep 17 00:00:00 2001
+From: Michael Krufky <mkrufky@linuxtv.org>
+Date: Fri, 25 May 2012 09:29:12 -0300
+Subject: media: smsusb: add autodetection support for USB ID 2040:f5a0
+
+From: Michael Krufky <mkrufky@linuxtv.org>
+
+commit 3e1141e2ce5667301a74ca2ef396d9bd5e995f7f upstream.
+
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/dvb/siano/smsusb.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/media/dvb/siano/smsusb.c
++++ b/drivers/media/dvb/siano/smsusb.c
+@@ -543,6 +543,8 @@ static const struct usb_device_id smsusb
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { USB_DEVICE(0x2040, 0xc0a0),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
++      { USB_DEVICE(0x2040, 0xf5a0),
++              .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { } /* Terminating entry */
+       };
+ 

diff --git a/queue-3.0/powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch b/queue-3.0/powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch
new file mode 100644 (file)
index 0000000..3b0f8e0
--- /dev/null
+++ b/queue-3.0/powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch
@@ -0,0 +1,54 @@
+From bc1d7702910c7c7e88eb60b58429dbfe293683ce Mon Sep 17 00:00:00 2001
+From: Anton Blanchard <anton@samba.org>
+Date: Thu, 28 Jun 2012 19:28:57 +0000
+Subject: powerpc/xmon: Use cpumask iterator to avoid warning
+
+From: Anton Blanchard <anton@samba.org>
+
+commit bc1d7702910c7c7e88eb60b58429dbfe293683ce upstream.
+
+We have a bug report where the kernel hits a warning in the cpumask
+code:
+
+WARNING: at include/linux/cpumask.h:107
+
+Which is:
+        WARN_ON_ONCE(cpu >= nr_cpumask_bits);
+
+The backtrace is:
+        cpu_cmd
+        cmds
+        xmon_core
+        xmon
+        die
+
+xmon is iterating through 0 to NR_CPUS. I'm not sure why we are still
+open coding this but iterating above nr_cpu_ids is definitely a bug.
+
+This patch iterates through all possible cpus, in case we issue a
+system reset and CPUs in an offline state call in.
+
+Perhaps the old code was trying to handle CPUs that were in the
+partition but were never started (eg kexec into a kernel with an
+nr_cpus= boot option). They are going to die way before we get into
+xmon since we haven't set any kernel state up for them.
+
+Signed-off-by: Anton Blanchard <anton@samba.org>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/xmon/xmon.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/xmon/xmon.c
++++ b/arch/powerpc/xmon/xmon.c
+@@ -975,7 +975,7 @@ static int cpu_cmd(void)
+               /* print cpus waiting or in xmon */
+               printf("cpus stopped:");
+               count = 0;
+-              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++              for_each_possible_cpu(cpu) {
+                       if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
+                               if (count == 0)
+                                       printf(" %x", cpu);

diff --git a/queue-3.0/series b/queue-3.0/series
index a873f58d4100aa527a64a2e36714b21168a90674..081d197661c9974f7b7452751646fa8a45617d6c 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -1 +1,3 @@
 alsa-hda-add-realtek-alc280-codec-support.patch
+powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch
+media-smsusb-add-autodetection-support-for-usb-id-2040-f5a0.patch