3.0-stable patches

added patches:
	acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch
	avr32-select-generic-atomic64_t-support.patch
	bsg-fix-sysfs-link-remove-warning.patch

diff --git a/queue-3.0/acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch b/queue-3.0/acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch
new file mode 100644 (file)
index 0000000..37dcaa9
--- /dev/null
+++ b/queue-3.0/acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch
@@ -0,0 +1,45 @@
+From 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c Mon Sep 17 00:00:00 2001
+From: Keng-Yu Lin <kengyu@canonical.com>
+Date: Fri, 2 Dec 2011 00:04:23 +0100
+Subject: ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR
+
+From: Keng-Yu Lin <kengyu@canonical.com>
+
+commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c upstream.
+
+The models do not resume correctly without acpi_sleep=nonvs.
+
+Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
+Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
+Cc: Tim Gardner <tim.gardner@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/sleep.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -428,6 +428,22 @@ static struct dmi_system_id __initdata a
+               DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
+               },
+       },
++      {
++      .callback = init_nvs_nosave,
++      .ident = "Asus K54C",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
++              DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
++              },
++      },
++      {
++      .callback = init_nvs_nosave,
++      .ident = "Asus K54HR",
++      .matches = {
++              DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
++              DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
++              },
++      },
+       {},
+ };
+ #endif /* CONFIG_SUSPEND */

diff --git a/queue-3.0/avr32-select-generic-atomic64_t-support.patch b/queue-3.0/avr32-select-generic-atomic64_t-support.patch
new file mode 100644 (file)
index 0000000..1416458
--- /dev/null
+++ b/queue-3.0/avr32-select-generic-atomic64_t-support.patch
@@ -0,0 +1,35 @@
+From 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688 Mon Sep 17 00:00:00 2001
+From: Fabio Baltieri <fabio.baltieri@gmail.com>
+Date: Fri, 3 Feb 2012 15:37:14 -0800
+Subject: avr32: select generic atomic64_t support
+
+From: Fabio Baltieri <fabio.baltieri@gmail.com>
+
+commit 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688 upstream.
+
+Enable use of the generic atomic64 implementation on AVR32 platforms.
+Without this the kernel fails to build as the architecture does not
+provide its version.
+
+Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
+Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
+Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/avr32/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/avr32/Kconfig
++++ b/arch/avr32/Kconfig
+@@ -8,6 +8,7 @@ config AVR32
+       select HAVE_KPROBES
+       select HAVE_GENERIC_HARDIRQS
+       select GENERIC_IRQ_PROBE
++      select GENERIC_ATOMIC64
+       select HARDIRQS_SW_RESEND
+       select GENERIC_IRQ_SHOW
+       help

diff --git a/queue-3.0/bsg-fix-sysfs-link-remove-warning.patch b/queue-3.0/bsg-fix-sysfs-link-remove-warning.patch
new file mode 100644 (file)
index 0000000..cec1b3f
--- /dev/null
+++ b/queue-3.0/bsg-fix-sysfs-link-remove-warning.patch
@@ -0,0 +1,56 @@
+From 37b40adf2d1b4a5e51323be73ccf8ddcf3f15dd3 Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Wed, 8 Feb 2012 20:02:03 +0100
+Subject: bsg: fix sysfs link remove warning
+
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+
+commit 37b40adf2d1b4a5e51323be73ccf8ddcf3f15dd3 upstream.
+
+We create "bsg" link if q->kobj.sd is not NULL, so remove it only
+when the same condition is true.
+
+Fixes:
+
+WARNING: at fs/sysfs/inode.c:323 sysfs_hash_and_remove+0x2b/0x77()
+sysfs: can not remove 'bsg', no directory
+Call Trace:
+  [<c0429683>] warn_slowpath_common+0x6a/0x7f
+  [<c0537a68>] ? sysfs_hash_and_remove+0x2b/0x77
+  [<c042970b>] warn_slowpath_fmt+0x2b/0x2f
+  [<c0537a68>] sysfs_hash_and_remove+0x2b/0x77
+  [<c053969a>] sysfs_remove_link+0x20/0x23
+  [<c05d88f1>] bsg_unregister_queue+0x40/0x6d
+  [<c0692263>] __scsi_remove_device+0x31/0x9d
+  [<c069149f>] scsi_forget_host+0x41/0x52
+  [<c0689fa9>] scsi_remove_host+0x71/0xe0
+  [<f7de5945>] quiesce_and_remove_host+0x51/0x83 [usb_storage]
+  [<f7de5a1e>] usb_stor_disconnect+0x18/0x22 [usb_storage]
+  [<c06c29de>] usb_unbind_interface+0x4e/0x109
+  [<c067a80f>] __device_release_driver+0x6b/0xa6
+  [<c067a861>] device_release_driver+0x17/0x22
+  [<c067a46a>] bus_remove_device+0xd6/0xe6
+  [<c06785e2>] device_del+0xf2/0x137
+  [<c06c101f>] usb_disable_device+0x94/0x1a0
+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/bsg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/block/bsg.c
++++ b/block/bsg.c
+@@ -985,7 +985,8 @@ void bsg_unregister_queue(struct request
+ 
+       mutex_lock(&bsg_mutex);
+       idr_remove(&bsg_minor_idr, bcd->minor);
+-      sysfs_remove_link(&q->kobj, "bsg");
++      if (q->kobj.sd)
++              sysfs_remove_link(&q->kobj, "bsg");
+       device_unregister(bcd->class_dev);
+       bcd->class_dev = NULL;
+       kref_put(&bcd->ref, bsg_kref_release_function);

diff --git a/queue-3.0/series b/queue-3.0/series
index 5c878f8e7f76a28d6f643f3df8b273109bde6486..42b6a53e5ef03066453e1dc79dd8b8e19ce7d247 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -33,3 +33,6 @@ crypto-mv_cesa-fix-final-callback-not-ignoring-input-data.patch
 osd_uld-bump-max_osd_devices-from-64-to-1-048-576.patch
 asoc-dapm-check-for-bias-level-when-powering-down.patch
 asoc-i.mx-ssi-fix-dsp_a-format.patch
+bsg-fix-sysfs-link-remove-warning.patch
+acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch
+avr32-select-generic-atomic64_t-support.patch