http://linux-acpi.bkbits.net/linux-acpi-test-2.6.7 len.brown@intel.com[lenb]|ChangeSet|20040814224208|35141 len.brown # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/08/15 00:51:42-07:00 akpm@bix.(none) # Merge http://linux-acpi.bkbits.net/linux-acpi-test-2.6.7 # into bix.(none):/usr/src/bk-acpi # # init/main.c # 2004/08/15 00:51:38-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/15 00:50:39-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi # # include/asm-x86_64/acpi.h # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/sleep/proc.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/sleep/main.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/scan.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/namespace/nsalloc.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/smpboot.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/setup.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/i8259.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ia64/kernel/acpi.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/mm/discontig.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/smpboot.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/setup.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/io_apic.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/i8259.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/08/15 00:50:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/14 18:42:08-04:00 len.brown@intel.com # [ACPI] ia64 build fix # Signed-off-by: Jesse Barnes # # include/asm-ia64/acpi.h # 2004/08/10 12:26:39-04:00 len.brown@intel.com +1 -0 # ia64 ACPI build fix # # ChangeSet # 2004/08/14 16:24:17-04:00 len.brown@intel.com # fix main.c build warning # # init/main.c # 2004/08/14 16:24:07-04:00 len.brown@intel.com +1 -1 # fix build warning # # ChangeSet # 2004/08/09 21:24:35-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi # # drivers/acpi/sleep/proc.c # 2004/08/09 21:24:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/05 19:47:19-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi # # arch/ia64/kernel/acpi.c # 2004/08/05 19:47:15-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/02 10:40:21-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi # # arch/x86_64/kernel/i8259.c # 2004/08/02 10:40:18-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/io_apic.c # 2004/08/02 10:40:18-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/29 23:09:19-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi # # arch/i386/kernel/io_apic.c # 2004/07/29 23:09:15-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/28 14:04:29-07:00 akpm@bix.(none) # Merge http://linux-acpi.bkbits.net/linux-acpi-test-2.6.7 # into bix.(none):/usr/src/bk-acpi # # arch/x86_64/kernel/smpboot.c # 2004/07/28 14:04:25-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/27 13:06:25-07:00 akpm@bix.(none) # Merge # # include/asm-x86_64/acpi.h # 2004/07/27 13:06:22-07:00 akpm@bix.(none) +4 -0 # SCCS merged # # drivers/acpi/sleep/main.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/scan.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/namespace/nsalloc.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/smpboot.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/setup.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/kernel/i8259.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ia64/kernel/acpi.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/mm/discontig.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/smpboot.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/setup.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/io_apic.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/07/27 13:05:22-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/i8259.c # 2004/07/27 13:05:21-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h --- a/include/asm-ia64/acpi.h 2004-08-16 09:35:42 -07:00 +++ b/include/asm-ia64/acpi.h 2004-08-16 09:35:42 -07:00 @@ -89,6 +89,7 @@ ((Acq) = ia64_acpi_release_global_lock((unsigned int *) GLptr)) #define acpi_disabled 0 /* ACPI always enabled on IA64 */ +#define acpi_noirq 0 /* ACPI always enabled on IA64 */ #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ static inline void disable_acpi(void) { } diff -Nru a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h --- a/include/asm-x86_64/acpi.h 2004-08-16 09:35:42 -07:00 +++ b/include/asm-x86_64/acpi.h 2004-08-16 09:35:42 -07:00 @@ -159,6 +159,10 @@ extern int acpi_disabled; extern int acpi_pci_disabled; +#define dmi_broken (0) +#define BROKEN_ACPI_Sx 0x0001 +#define BROKEN_INIT_AFTER_S1 0x0002 + extern u8 x86_acpiid_to_apicid[]; #endif /*__KERNEL__*/ diff -Nru a/init/main.c b/init/main.c --- a/init/main.c 2004-08-16 09:35:42 -07:00 +++ b/init/main.c 2004-08-16 09:35:42 -07:00 @@ -96,7 +96,7 @@ #ifdef CONFIG_ACPI extern void acpi_early_init(void); #else -static inline acpi_early_init() { } +static inline void acpi_early_init(void) { } #endif #ifdef CONFIG_TC