From: Greg Kroah-Hartman Date: Fri, 9 Oct 2009 23:03:05 +0000 (-0700) Subject: more .31 patches X-Git-Tag: v2.6.27.37~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7a28a8174422a088bbe6ea1ad3405017e1ba8df;p=thirdparty%2Fkernel%2Fstable-queue.git more .31 patches --- diff --git a/queue-2.6.31/acpi-clarify-resource-conflict-message.patch b/queue-2.6.31/acpi-clarify-resource-conflict-message.patch new file mode 100644 index 00000000000..17b49d7222f --- /dev/null +++ b/queue-2.6.31/acpi-clarify-resource-conflict-message.patch @@ -0,0 +1,53 @@ +From 14f03343ad1080c2fea29ab2c13f05b976c4584e Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 8 Sep 2009 15:31:46 +0200 +Subject: ACPI: Clarify resource conflict message + +From: Jean Delvare + +commit 14f03343ad1080c2fea29ab2c13f05b976c4584e upstream. + +The message "ACPI: Device needs an ACPI driver" is misleading. The +device _may_ need an ACPI driver, if the BIOS implemented a custom +API for the device in question (which, AFAIK, can't be checked.) If +not, then either a generic ACPI driver may be used (for example +"thermal"), or nothing can be done (other than a white list). + +I propose to reword the message to: + +ACPI: If an ACPI driver is available for this device, you should use +it instead of the native driver + +which I think is more correct. Comments and suggestions welcome. + +I also added a message warning about possible problems and system +instability when users pass acpi_enforce_resources=lax, as suggested +by Len. + +Signed-off-by: Jean Delvare +Cc: Thomas Renninger +Cc: Alan Jenkins +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/osl.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/acpi/osl.c ++++ b/drivers/acpi/osl.c +@@ -1182,7 +1182,13 @@ int acpi_check_resource_conflict(struct + res_list_elem->name, + (long long) res_list_elem->start, + (long long) res_list_elem->end); +- printk(KERN_INFO "ACPI: Device needs an ACPI driver\n"); ++ if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) ++ printk(KERN_NOTICE "ACPI: This conflict may" ++ " cause random problems and system" ++ " instability\n"); ++ printk(KERN_INFO "ACPI: If an ACPI driver is available" ++ " for this device, you should use it instead of" ++ " the native driver\n"); + } + if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT) + return -EBUSY; diff --git a/queue-2.6.31/acpi-fix-compaq-evo-n800c-boot-hang-regression.patch b/queue-2.6.31/acpi-fix-compaq-evo-n800c-boot-hang-regression.patch new file mode 100644 index 00000000000..ab0be045057 --- /dev/null +++ b/queue-2.6.31/acpi-fix-compaq-evo-n800c-boot-hang-regression.patch @@ -0,0 +1,35 @@ +From 3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7 Mon Sep 17 00:00:00 2001 +From: Zhao Yakui +Date: Sun, 27 Sep 2009 03:30:51 -0400 +Subject: ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression + +From: Zhao Yakui + +commit 3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7 upstream. + +Don't disable ARB_DISABLE when the familary ID is 0x0F. + +http://bugzilla.kernel.org/show_bug.cgi?id=14211 + +This was a 2.6.31 regression, and so this patch +needs to be applied to 2.6.31.stable + +Signed-off-by: Zhao Yakui +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/acpi/cstate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/kernel/acpi/cstate.c ++++ b/arch/x86/kernel/acpi/cstate.c +@@ -48,7 +48,7 @@ void acpi_processor_power_init_bm_check( + * P4, Core and beyond CPUs + */ + if (c->x86_vendor == X86_VENDOR_INTEL && +- (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 14))) ++ (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14))) + flags->bm_control = 0; + } + EXPORT_SYMBOL(acpi_processor_power_init_bm_check); diff --git a/queue-2.6.31/series b/queue-2.6.31/series index 53f2cbaebcd..807cf50807d 100644 --- a/queue-2.6.31/series +++ b/queue-2.6.31/series @@ -22,3 +22,5 @@ mm-add_to_swap_cache-must-not-sleep.patch sis5513-fix-pio-setup-for-atapi-devices.patch pit-fixes-to-unbreak-suspend-resume.patch ima-open-new-file-for-read.patch +acpi-clarify-resource-conflict-message.patch +acpi-fix-compaq-evo-n800c-boot-hang-regression.patch