# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1178 -> 1.1179 # arch/i386/kernel/acpi.c 1.21 -> 1.22 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 04/03/05 len.brown@intel.com 1.1179 # [ACPI] acpi_wakeup_address - print only when broken # -------------------------------------------- # diff -Nru a/arch/i386/kernel/acpi.c b/arch/i386/kernel/acpi.c --- a/arch/i386/kernel/acpi.c Fri Mar 5 00:55:21 2004 +++ b/arch/i386/kernel/acpi.c Fri Mar 5 00:55:21 2004 @@ -655,7 +655,8 @@ void __init acpi_reserve_bootmem(void) { acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE); - printk(KERN_DEBUG "ACPI: have wakeup address 0x%8.8lx\n", acpi_wakeup_address); + if (!acpi_wakeup_address) + printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n"); } void do_suspend_lowlevel_s4bios(int resume)