On Tue 2009-11-10 18:27:23, Yinghai Lu wrote:
>
> try to find_e820_area/reserve_early, and call acpi_reserve_memory early
>
> to get area is below 1M
Does it fix anything? I can't tell from the changelog...
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Please CC me on suspend patches.
> /*
> * Check if the CPU can handle C2 and deeper
> Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/acpi/sleep.c
> +++ linux-2.6/arch/x86/kernel/acpi/sleep.c
> @@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
>
>
> /**
> - * acpi_reserve_bootmem - do _very_ early ACPI initialisation
> + * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
> *
> * We allocate a page from the first 1MB of memory for the wakeup
> * routine for when we come back from a sleep state. The
> * runtime allocator allows specification of <16MB pages, but not
> * <1MB pages.
> */
> -void __init acpi_reserve_bootmem(void)
> +void __init acpi_reserve_wakeup_memory(void)
> {
> + unsigned long mem;
> +
> if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {
> printk(KERN_ERR
> "ACPI: Wakeup code way too big, S3 disabled.\n");
> return;
> }
>
> - acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
> + mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);
>
> - if (!acpi_realmode) {
> + if (mem == -1L) {
> printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
> return;
> }
How is it better then old code?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
