]> err.no Git - linux-2.6/commitdiff
ACPI: don't walk tables if ACPI was disabled
authorVegard Nossum <vegard.nossum@gmail.com>
Fri, 20 Jun 2008 13:39:09 +0000 (15:39 +0200)
committerLen Brown <len.brown@intel.com>
Thu, 26 Jun 2008 05:55:18 +0000 (01:55 -0400)
Ingo Molnar wrote:
> -tip auto-testing started triggering this spinlock corruption message
> yesterday:
>
> [    3.976213] calling  acpi_rtc_init+0x0/0xd3
> [    3.980213] ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread F7C50000 could not acquire Mutex [3] [20080321]
> [    3.992213] BUG: spinlock bad magic on CPU#0, swapper/1
> [    3.992213]  lock: c2508dc4, .magic: 00000000, .owner: swapper/1, .owner_cpu: 0

This is apparently because some parts of ACPI, including mutexes, are not
initialized when acpi=off is passed to the kernel.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/glue.c

index 2808dc60fd670065a94ddf4c0be90876fd3fc20a..9b227d4dc9c9bbd43b7649b66b7ee311371f7eaf 100644 (file)
@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void)
 {
        struct device *dev = get_rtc_dev();
 
+       if (acpi_disabled)
+               return 0;
+
        if (dev) {
                rtc_wake_setup();
                rtc_info.wake_on = rtc_wake_on;