From e8f265d835c74e3c579552d93cf53aab0278ddd7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Mar 2012 10:48:24 -0800 Subject: [PATCH] 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 --- ...-save-restore-nvs-on-asus-k54c-k54hr.patch | 45 +++++++++++++++ ...32-select-generic-atomic64_t-support.patch | 35 ++++++++++++ .../bsg-fix-sysfs-link-remove-warning.patch | 56 +++++++++++++++++++ queue-3.0/series | 3 + 4 files changed, 139 insertions(+) create mode 100644 queue-3.0/acpi-pm-do-not-save-restore-nvs-on-asus-k54c-k54hr.patch create mode 100644 queue-3.0/avr32-select-generic-atomic64_t-support.patch create mode 100644 queue-3.0/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 index 00000000000..37dcaa9b5d1 --- /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 +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 + +commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c upstream. + +The models do not resume correctly without acpi_sleep=nonvs. + +Signed-off-by: Keng-Yu Lin +Signed-off-by: Rafael J. Wysocki +Cc: Tim Gardner +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..1416458594d --- /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 +Date: Fri, 3 Feb 2012 15:37:14 -0800 +Subject: avr32: select generic atomic64_t support + +From: Fabio Baltieri + +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 +Acked-by: Hans-Christian Egtvedt +Cc: Haavard Skinnemoen +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Cc: Jean-Christophe PLAGNIOL-VILLARD +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..cec1b3f2a1d --- /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 +Date: Wed, 8 Feb 2012 20:02:03 +0100 +Subject: bsg: fix sysfs link remove warning + +From: Stanislaw Gruszka + +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: + [] warn_slowpath_common+0x6a/0x7f + [] ? sysfs_hash_and_remove+0x2b/0x77 + [] warn_slowpath_fmt+0x2b/0x2f + [] sysfs_hash_and_remove+0x2b/0x77 + [] sysfs_remove_link+0x20/0x23 + [] bsg_unregister_queue+0x40/0x6d + [] __scsi_remove_device+0x31/0x9d + [] scsi_forget_host+0x41/0x52 + [] scsi_remove_host+0x71/0xe0 + [] quiesce_and_remove_host+0x51/0x83 [usb_storage] + [] usb_stor_disconnect+0x18/0x22 [usb_storage] + [] usb_unbind_interface+0x4e/0x109 + [] __device_release_driver+0x6b/0xa6 + [] device_release_driver+0x17/0x22 + [] bus_remove_device+0xd6/0xe6 + [] device_del+0xf2/0x137 + [] usb_disable_device+0x94/0x1a0 + +Signed-off-by: Stanislaw Gruszka +Signed-off-by: Jens Axboe +Signed-off-by: Tim Gardner +Signed-off-by: Greg Kroah-Hartman + +--- + 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 5c878f8e7f7..42b6a53e5ef 100644 --- 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 -- 2.47.3