Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=376ff0352c24a5fa47f1250dd60937b5a9077672
Commit: 376ff0352c24a5fa47f1250dd60937b5a9077672
Parent: 63fefb7d5bac6e65b5df2b7eb4aa56bb4bbadd48
Author: Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:30:16 2008 +0100
Committer: Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:30:16 2008 +0100
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 <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
arch/x86/kernel/setup_32.c | 3 +--
arch/x86/kernel/setup_64.c | 2 --
include/asm-x86/acpi_32.h | 2 --
include/asm-x86/pci.h | 4 +++-
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 51bdc0b..236d30b 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 ec976ed..97a4976 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 723493e..3cce5a0 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 e883619..6983730 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 dabba55..64fe816 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
