Check for errors & small cleanups in acpi
Hi!
acpi_save_state_disk is obsolete. swsusp is doing S4, and not even S4bios would use that. Killed.
Check for memory allocation failure added, and better comment (thanks to ak).
Please apply,
Pavel
arch/i386/kernel/acpi.c +5 -2
@@ -480,6 +481,8 @@panic ("S3 and PAE do not like each other for now." );return 1 ;#endif +if (!acpi_wakeup_address) +return 1 ;init_low_mapping (swapper_pg_dir,USER_PTRS_PER_PGD );memcpy ((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);acpi_copy_wakeup_routine (acpi_wakeup_address);
@@ -507,7 +501,7 @@/** * acpi_reserve_bootmem - do _very_ early ACPI initialisation * -* We allocate a page in low memory for the wakeup +* We allocate a page in 1MB low memory for the wakeup * routine for when we come back from a sleep state. The * runtime allocator allows specification of <16M pages, but not * <1M pages.
@@ -515,9 +509,10 @@void __init acpi_reserve_bootmem (void ) { acpi_wakeup_address = (unsigned long )alloc_bootmem_low (PAGE_SIZE ); +if (!acpi_wakeup_address) +printk (KERN_ERR "ACPI: Cannot allocate lowmem. S3 disabled.\n" );if ((&wakeup_end - &wakeup_start) >PAGE_SIZE )printk (KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n" ); -printk (KERN_DEBUG "ACPI: have wakeup address 0x%8.8lx\n" , acpi_wakeup_address); }#endif /*CONFIG_ACPI_SLEEP*/
Signature · 8 lines
Worst form of spam? Adding advertisment signatures ala sourceforge.net. What goes next? Inserting advertisment *into* email? ------------------------------------------------------- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com
A message that is not in the archive (sent off-list or not yet received): 20030127164157.GA5707-I/[email protected]
Quoted 5 lines · Pavel Machek
Hi!
acpi_save_state_diskis obsolete. swsusp is doing S4, and not even S4bios would use that. Killed.
Please don't kill acpi_save_state_disk(). I could use it in the future.
Signature · 10 lines
Ducrot Bruno -- Which is worse: ignorance or apathy? -- Don't know. Don't care. ------------------------------------------------------- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com