diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 9c0ef4945a58..62adc5f20be5 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <linux/dmi.h> | 45 | #include <linux/dmi.h> |
46 | #include <linux/pfn.h> | 46 | #include <linux/pfn.h> |
47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
48 | #include <linux/init_ohci1394_dma.h> | ||
48 | 49 | ||
49 | #include <video/edid.h> | 50 | #include <video/edid.h> |
50 | 51 | ||
@@ -787,6 +788,16 @@ void __init setup_arch(char **cmdline_p) | |||
787 | smp_alloc_memory(); /* AP processor realmode stacks in low memory*/ | 788 | smp_alloc_memory(); /* AP processor realmode stacks in low memory*/ |
788 | #endif | 789 | #endif |
789 | paging_init(); | 790 | paging_init(); |
791 | |||
792 | /* | ||
793 | * NOTE: On x86-32, only from this point on, fixmaps are ready for use. | ||
794 | */ | ||
795 | |||
796 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | ||
797 | if (init_ohci1394_dma_early) | ||
798 | init_ohci1394_dma_on_all_controllers(); | ||
799 | #endif | ||
800 | |||
790 | remapped_pgdat_init(); | 801 | remapped_pgdat_init(); |
791 | sparse_init(); | 802 | sparse_init(); |
792 | zone_sizes_init(); | 803 | zone_sizes_init(); |