redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Thomas Gleixner 2008-01-30 13:30:16 +01:00 committed by Ingo Molnar
parent 63fefb7d5b
commit 376ff0352c
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/setup_32.c
View File

@ -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();

2
arch/x86/kernel/setup_64.c
View File

@ -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

2
include/asm-x86/acpi_32.h
View File

@ -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;

4
include/asm-x86/pci.h
View File

@ -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

3
include/asm-x86/proto.h
View File

@ -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);