diff options
| -rw-r--r-- | acpi-sony-nonvs-blacklist.patch | 19 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 24 insertions, 0 deletions
diff --git a/acpi-sony-nonvs-blacklist.patch b/acpi-sony-nonvs-blacklist.patch new file mode 100644 index 000000000..f332c6443 --- /dev/null +++ b/acpi-sony-nonvs-blacklist.patch @@ -0,0 +1,19 @@ +diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c +index 3ed80b2..17fc718 100644 +--- a/drivers/acpi/sleep.c ++++ b/drivers/acpi/sleep.c +@@ -390,6 +390,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { + }, + { + .callback = init_nvs_nosave, ++ .ident = "Sony Vaio VGN-FW21E", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"), ++ }, ++ }, ++ { ++ .callback = init_nvs_nosave, + .ident = "Sony Vaio VGN-SR11M", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), diff --git a/kernel.spec b/kernel.spec index 5ef7a3ee3..68001e0bf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -657,6 +657,7 @@ Patch390: linux-2.6-defaults-acpi-video.patch Patch391: linux-2.6-acpi-video-dos.patch Patch394: linux-2.6-acpi-debug-infinite-loop.patch Patch395: acpi-ensure-thermal-limits-match-cpu-freq.patch +Patch396: acpi-sony-nonvs-blacklist.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch452: linux-2.6.30-no-pcspkr-modalias.patch @@ -1258,6 +1259,7 @@ ApplyPatch linux-2.6-defaults-acpi-video.patch ApplyPatch linux-2.6-acpi-video-dos.patch ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch ApplyPatch acpi-ensure-thermal-limits-match-cpu-freq.patch +ApplyPatch acpi-sony-nonvs-blacklist.patch # Various low-impact patches to aid debugging. ApplyPatch linux-2.6-debug-taint-vm.patch @@ -2083,6 +2085,9 @@ fi # ||----w | # || || %changelog +* Wed Oct 19 2011 Dave Jones <davej@redhat.com> +- Add Sony VGN-FW21E to nonvs blacklist. (rhbz 641789) + * Wed Oct 19 2011 Chuck Ebbert <cebbert@redhat.com> - Sync with F16 - Linux 3.1-rc10 |