diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-06-20 15:39:09 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-06-26 07:55:18 +0200 |
| commit | 4389ed2ff61de2b1485b31bf342da913dd342f59 (patch) | |
| tree | de76430883cff7fe392afbe71aea5b4ad0786ba7 /drivers/acpi | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | linux-4389ed2ff61de2b1485b31bf342da913dd342f59.tar.xz linux-4389ed2ff61de2b1485b31bf342da913dd342f59.zip | |
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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/glue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 2808dc60fd67..9b227d4dc9c9 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -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; |