aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/kernel/acpi/boot.c3
-rw-r--r--include/asm-x86_64/proto.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index f3761b98c8dd..c809a3f4c0bf 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -47,9 +47,6 @@ EXPORT_SYMBOL(acpi_disabled);
47 47
48#ifdef CONFIG_X86_64 48#ifdef CONFIG_X86_64
49 49
50extern void __init clustered_apic_check(void);
51
52extern int gsi_irq_sharing(int gsi);
53#include <asm/proto.h> 50#include <asm/proto.h>
54 51
55static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } 52static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 151826f8ce69..b73d0c76613c 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -124,6 +124,8 @@ extern int fix_aperture;
124extern int reboot_force; 124extern int reboot_force;
125extern int notsc_setup(char *); 125extern int notsc_setup(char *);
126 126
127extern int gsi_irq_sharing(int gsi);
128
127extern void smp_local_timer_interrupt(struct pt_regs * regs); 129extern void smp_local_timer_interrupt(struct pt_regs * regs);
128 130
129long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); 131long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);