[PATCH] x86: fix compile error if !CONFIG_ACPI

[PATCH] x86: fix compile error if !CONFIG_ACPI

[Andreas Herrmann]

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.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
 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(-)

diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
index 4f8730e..c8afeea 100644
--- a/include/asm-x86/acpi_32.h
+++ b/include/asm-x86/acpi_32.h
@@ -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;
diff --git a/include/asm-x86/acpi_64.h b/include/asm-x86/acpi_64.h
index e2f3411..58114ed 100644
--- a/include/asm-x86/acpi_64.h
+++ b/include/asm-x86/acpi_64.h
@@ -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;
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
index e883619..7d011db 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)
-- 
1.5.3.4

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

[Thomas Gleixner]

On Wed, 7 Nov 2007, Andreas Herrmann wrote:

> 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

> Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
> ---
>  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(-)
> 
> diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
> index 4f8730e..c8afeea 100644
> --- a/include/asm-x86/acpi_32.h
> +++ b/include/asm-x86/acpi_32.h
> @@ -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;
> diff --git a/include/asm-x86/acpi_64.h b/include/asm-x86/acpi_64.h
> index e2f3411..58114ed 100644
> --- a/include/asm-x86/acpi_64.h
> +++ b/include/asm-x86/acpi_64.h
> @@ -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;
> diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
> index e883619..7d011db 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)
> -- 
> 1.5.3.4
> 
> 
> 
>