Commit 4389ed2f authored by Vegard Nossum's avatar Vegard Nossum Committed by Len Brown

ACPI: don't walk tables if ACPI was disabled

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 543cf4cb
...@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void) ...@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void)
{ {
struct device *dev = get_rtc_dev(); struct device *dev = get_rtc_dev();
if (acpi_disabled)
return 0;
if (dev) { if (dev) {
rtc_wake_setup(); rtc_wake_setup();
rtc_info.wake_on = rtc_wake_on; rtc_info.wake_on = rtc_wake_on;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment