Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376ff035 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 63fefb7d

arch/x86/kernel/setup_32.c

+1 −2
Original line number Diff line number Diff line
@@ -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();

arch/x86/kernel/setup_64.c

+0 −2
Original line number Diff line number Diff line
@@ -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

include/asm-x86/acpi_32.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/pci.h

+3 −1
Original line number Diff line number Diff line
@@ -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

include/asm-x86/proto.h

+0 −3
Original line number Diff line number Diff line
@@ -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);