diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-12-16 15:17:36 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 12:58:19 -0500 |
commit | cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 (patch) | |
tree | 8343c02e8599f0e038cc9c0b303854193fb38e37 /arch/x86/mm | |
parent | 8ce7996009bab7b2d23e7af7ad831fed7eb6faa1 (diff) |
x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
swiotlb on 32 bit will be used by Xen domain 0 support.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/init_32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index c483f4242079..2b4b14fc0c04 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
23 | #include <linux/pagemap.h> | 23 | #include <linux/pagemap.h> |
24 | #include <linux/pci.h> | ||
24 | #include <linux/pfn.h> | 25 | #include <linux/pfn.h> |
25 | #include <linux/poison.h> | 26 | #include <linux/poison.h> |
26 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
@@ -971,6 +972,8 @@ void __init mem_init(void) | |||
971 | 972 | ||
972 | start_periodic_check_for_corruption(); | 973 | start_periodic_check_for_corruption(); |
973 | 974 | ||
975 | pci_iommu_alloc(); | ||
976 | |||
974 | #ifdef CONFIG_FLATMEM | 977 | #ifdef CONFIG_FLATMEM |
975 | BUG_ON(!mem_map); | 978 | BUG_ON(!mem_map); |
976 | #endif | 979 | #endif |