On Mon, 12 Nov 2007, Andrew Morton wrote:
> hm, that doesn't seem right. We want to run the early quirks on non-ACPI
> kernel too, surely?
>
> If so then the fix would be to move the early_quirks() declaration from
> include/asm-x86/acpi_[32|64].h into, say, include/asm-x86/pci.h. And while
> we're there, do the config dependency in the correct way:
Yeah, the same fix is in the cleanup branch. I push this one Linus wards.
tglx
> From: Andrew Morton <[email protected]>
>
> With CONFIG_ACPI=n:
>
> arch/x86/kernel/setup_64.c: In function 'setup_arch':
> arch/x86/kernel/setup_64.c:420: error: implicit declaration of function 'early_quirks'
>
> because the early_quirks() declaraion is inside an ACPI header file.
>
> Move it out of there and into include/asm-x86/pci.h and clean a few related
> things up.
>
> Cc: Erez Zadok <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Andi Kleen <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> ---
>
> arch/x86/kernel/early-quirks.c | 1 +
> arch/x86/kernel/setup_32.c | 3 +--
> arch/x86/kernel/setup_64.c | 2 --
> include/asm-x86/acpi_32.h | 2 --
> include/asm-x86/acpi_64.h | 2 --
> include/asm-x86/pci.h | 4 ++++
> 6 files changed, 6 insertions(+), 8 deletions(-)
>
> diff -puN include/asm-x86/acpi_32.h~x86-early_quirks-fix-build include/asm-x86/acpi_32.h
> --- a/include/asm-x86/acpi_32.h~x86-early_quirks-fix-build
> +++ a/include/asm-x86/acpi_32.h
> @@ -79,8 +79,6 @@ int __acpi_release_global_lock(unsigned
> :"=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 -puN include/asm-x86/acpi_64.h~x86-early_quirks-fix-build include/asm-x86/acpi_64.h
> --- a/include/asm-x86/acpi_64.h~x86-early_quirks-fix-build
> +++ a/include/asm-x86/acpi_64.h
> @@ -78,8 +78,6 @@ int __acpi_release_global_lock(unsigned
> :"=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 -puN include/asm-x86/pci.h~x86-early_quirks-fix-build include/asm-x86/pci.h
> --- a/include/asm-x86/pci.h~x86-early_quirks-fix-build
> +++ a/include/asm-x86/pci.h
> @@ -40,8 +40,12 @@ static inline int pci_proc_domain(struct
>
> #ifdef CONFIG_PCI
> extern unsigned int pcibios_assign_all_busses(void);
> +extern void early_quirks(void);
> #else
> #define pcibios_assign_all_busses() 0
> +static inline void early_quirks(void)
> +{
> +}
> #endif
> #define pcibios_scan_all_fns(a, b) 0
>
> diff -puN arch/x86/kernel/setup_32.c~x86-early_quirks-fix-build arch/x86/kernel/setup_32.c
> --- a/arch/x86/kernel/setup_32.c~x86-early_quirks-fix-build
> +++ a/arch/x86/kernel/setup_32.c
> @@ -41,6 +41,7 @@
> #include <linux/edd.h>
> #include <linux/nodemask.h>
> #include <linux/kexec.h>
> +#include <linux/pci.h>
> #include <linux/crash_dump.h>
> #include <linux/dmi.h>
> #include <linux/pfn.h>
> @@ -732,9 +733,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 -puN arch/x86/kernel/setup_64.c~x86-early_quirks-fix-build arch/x86/kernel/setup_64.c
> --- a/arch/x86/kernel/setup_64.c~x86-early_quirks-fix-build
> +++ a/arch/x86/kernel/setup_64.c
> @@ -408,9 +408,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 -puN arch/x86/kernel/early-quirks.c~x86-early_quirks-fix-build arch/x86/kernel/early-quirks.c
> --- a/arch/x86/kernel/early-quirks.c~x86-early_quirks-fix-build
> +++ a/arch/x86/kernel/early-quirks.c
> @@ -12,6 +12,7 @@
> #include <linux/pci.h>
> #include <linux/acpi.h>
> #include <linux/pci_ids.h>
> +
> #include <asm/pci-direct.h>
> #include <asm/dma.h>
> #include <asm/io_apic.h>
> _
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
