diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:16 +0100 |
| commit | 376ff0352c24a5fa47f1250dd60937b5a9077672 (patch) | |
| tree | 7f5b8a260e2eb65eb9e71aa0639f7ef4825d4a40 | |
| parent | 63fefb7d5bac6e65b5df2b7eb4aa56bb4bbadd48 (diff) | |
| download | linux-stable-376ff0352c24a5fa47f1250dd60937b5a9077672.tar.gz linux-stable-376ff0352c24a5fa47f1250dd60937b5a9077672.tar.bz2 linux-stable-376ff0352c24a5fa47f1250dd60937b5a9077672.zip | |
x86: move acpi and pci declarations
Move acpi/pci related declarations to the correct headers
and remove the duplicate.
Build fix from: Andrew Morton
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 2 | ||||
| -rw-r--r-- | include/asm-x86/acpi_32.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/pci.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/proto.h | 3 |
5 files changed, 4 insertions, 10 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 51bdc0b1b72e..236d30b264d8 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -44,6 +44,7 @@ #include <linux/crash_dump.h> #include <linux/dmi.h> #include <linux/pfn.h> +#include <linux/pci.h> #include <video/edid.h> @@ -663,9 +664,7 @@ void __init setup_arch(char **cmdline_p) acpi_boot_table_init(); #endif -#ifdef CONFIG_PCI early_quirks(); -#endif #ifdef CONFIG_ACPI acpi_boot_init(); diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index ec976edf0399..97a497652d20 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -407,9 +407,7 @@ void __init setup_arch(char **cmdline_p) reserve_crashkernel(); paging_init(); -#ifdef CONFIG_PCI early_quirks(); -#endif /* * set this early, so we dont allocate cpu0 diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h index 723493e6c851..3cce5a0f2d9c 100644 --- a/include/asm-x86/acpi_32.h +++ b/include/asm-x86/acpi_32.h @@ -81,8 +81,6 @@ int __acpi_release_global_lock(unsigned int *lock); :"=r"(n_hi), "=r"(n_lo) \ :"0"(n_hi), "1"(n_lo)) -extern void early_quirks(void); - #ifdef CONFIG_ACPI extern int acpi_lapic; extern int acpi_ioapic; diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index e88361966347..6983730d86fd 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h @@ -66,6 +66,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, #ifdef CONFIG_PCI +extern void early_quirks(void); static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, unsigned long *strategy_parameter) @@ -73,9 +74,10 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, *strat = PCI_DMA_BURST_INFINITY; *strategy_parameter = ~0UL; } +#else +static inline void early_quirks(void) { } #endif - #endif /* __KERNEL__ */ #ifdef CONFIG_X86_32 diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h index dabba55f7ed8..64fe816ea37a 100644 --- a/include/asm-x86/proto.h +++ b/include/asm-x86/proto.h @@ -58,8 +58,6 @@ extern void show_registers(struct pt_regs *regs); extern void exception_table_check(void); -extern void acpi_reserve_bootmem(void); - extern void swap_low_mappings(void); extern void __show_regs(struct pt_regs * regs); @@ -69,7 +67,6 @@ extern void syscall32_cpu_init(void); extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end); -extern void early_quirks(void); extern void check_efer(void); extern void select_idle_routine(const struct cpuinfo_x86 *c); |