diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 978dc0196a0f..ba2e165a8a0f 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -624,7 +624,7 @@ void __init setup_arch(char **cmdline_p) | |||
624 | /* | 624 | /* |
625 | * NOTE: before this point _nobody_ is allowed to allocate | 625 | * NOTE: before this point _nobody_ is allowed to allocate |
626 | * any memory using the bootmem allocator. Although the | 626 | * any memory using the bootmem allocator. Although the |
627 | * alloctor is now initialised only the first 8Mb of the kernel | 627 | * allocator is now initialised only the first 8Mb of the kernel |
628 | * virtual address space has been mapped. All allocations before | 628 | * virtual address space has been mapped. All allocations before |
629 | * paging_init() has completed must use the alloc_bootmem_low_pages() | 629 | * paging_init() has completed must use the alloc_bootmem_low_pages() |
630 | * variant (which allocates DMA'able memory) and care must be taken | 630 | * variant (which allocates DMA'able memory) and care must be taken |
@@ -661,9 +661,7 @@ void __init setup_arch(char **cmdline_p) | |||
661 | #endif | 661 | #endif |
662 | 662 | ||
663 | #ifdef CONFIG_PCI | 663 | #ifdef CONFIG_PCI |
664 | #ifdef CONFIG_X86_IO_APIC | 664 | early_quirks(); |
665 | check_acpi_pci(); /* Checks more than just ACPI actually */ | ||
666 | #endif | ||
667 | #endif | 665 | #endif |
668 | 666 | ||
669 | #ifdef CONFIG_ACPI | 667 | #ifdef CONFIG_ACPI |