From 5fe339ebe6ee098cd6b469fabf43fe5d237bad8c Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 26 Sep 2006 10:52:33 +0200 Subject: [PATCH] --- yaml --- r: 35861 b: refs/heads/master c: 91cd444e56ebe0c2acd9576a045d77490b26f607 h: refs/heads/master i: 35859: 59a093bf9af8c8fa665479fbec5a9c4d9b6a3780 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/acpi/boot.c | 3 --- trunk/include/asm-x86_64/proto.h | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 121178f35cbe..70b8567564ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b94ab2fd55768030e177a6ec224dedd031ad06b +refs/heads/master: 91cd444e56ebe0c2acd9576a045d77490b26f607 diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c index f3761b98c8dd..c809a3f4c0bf 100644 --- a/trunk/arch/i386/kernel/acpi/boot.c +++ b/trunk/arch/i386/kernel/acpi/boot.c @@ -47,9 +47,6 @@ EXPORT_SYMBOL(acpi_disabled); #ifdef CONFIG_X86_64 -extern void __init clustered_apic_check(void); - -extern int gsi_irq_sharing(int gsi); #include static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } diff --git a/trunk/include/asm-x86_64/proto.h b/trunk/include/asm-x86_64/proto.h index 151826f8ce69..b73d0c76613c 100644 --- a/trunk/include/asm-x86_64/proto.h +++ b/trunk/include/asm-x86_64/proto.h @@ -124,6 +124,8 @@ extern int fix_aperture; extern int reboot_force; extern int notsc_setup(char *); +extern int gsi_irq_sharing(int gsi); + extern void smp_local_timer_interrupt(struct pt_regs * regs); long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);