Skip to contentSkip to conversation

x86: fix compile error if !CONFIG_ACPI

PATCH In review Andreas Herrmann 2 participants 2 messages Nov 7, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: fix compile error if !CONFIG_ACPI

Following patch is against cleanup branch of the x86 tree.

Regards,

Andreas

--
[PATCH] x86: fix compile error if !CONFIG_ACPI

arch/x86/kernel/setup_64.c: In setup_:
arch/x86/kernel/setup_64.c:412: error: implicit declaration of function early_ quirks

Move declaration of early_quirks to the corresponding PCI header file. IMHO, this is where it really belongs to.

---
 include/asm-x86/acpi_32.h |    2 --
 include/asm-x86/acpi_64.h |    2 --
 include/asm-x86/pci.h     |    1 +
 3 files changed, 1 insertions(+), 4 deletions(-)
include/asm-x86/acpi_32.h +0 -2
index 4f8730e..c8afeea 100644
@@ -79,8 +79,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/acpi_64.h +0 -2
index e2f3411..58114ed 100644
@@ -78,8 +78,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 +1 -0
index e883619..7d011db 100644
@@ -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)
Signature · 1 line
1.5.3.4
#1 lore raw
Quoted 9 lines · Andreas Herrmann

Following patch is against cleanup branch of the x86 tree. [PATCH] x86: fix compile error if !CONFIG_ACPI

arch/x86/kernel/setup_64.c: In setup_:
arch/x86/kernel/setup_64.c:412: error: implicit declaration of function early_ quirks

Move declaration of early_quirks to the corresponding PCI header file. IMHO, this is where it really belongs to.

Good point. Applied, thanks

tglx

Quoted 51 lines
---
 include/asm-x86/acpi_32.h |    2 --
 include/asm-x86/acpi_64.h |    2 --
 include/asm-x86/pci.h     |    1 +
 3 files changed, 1 insertions(+), 4 deletions(-)
include/asm-x86/acpi_32.h +0 -2
index 4f8730e..c8afeea 100644
@@ -79,8 +79,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/acpi_64.h +0 -2
index e2f3411..58114ed 100644
@@ -78,8 +78,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 +1 -0
index e883619..7d011db 100644
@@ -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)
Signature · 1 line
1.5.3.4