Commit 94bd188d authored by Len Brown's avatar Len Brown Committed by Len Brown

[ACPI] S3 is independent of CONFIG_X86_PAE (David Shaohua Li)

parent 7e06bff2
...@@ -77,10 +77,7 @@ void __init acpi_reserve_bootmem(void) ...@@ -77,10 +77,7 @@ void __init acpi_reserve_bootmem(void)
printk(KERN_ERR "ACPI: Wakeup code way too big, S3 disabled.\n"); printk(KERN_ERR "ACPI: Wakeup code way too big, S3 disabled.\n");
return; return;
} }
#ifdef CONFIG_X86_PAE
printk(KERN_ERR "ACPI: S3 and PAE do not like each other for now, S3 disabled.\n");
return;
#endif
acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE); acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE);
if (!acpi_wakeup_address) if (!acpi_wakeup_address)
printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n"); printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
......
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