diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-12-16 21:17:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 18:58:19 +0100 |
commit | cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 (patch) | |
tree | 8343c02e8599f0e038cc9c0b303854193fb38e37 /arch/x86/mm | |
parent | x86: add swiotlb allocation functions (diff) | |
download | linux-cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8.tar.xz linux-cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8.zip |
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 @@ #include <linux/init.h> #include <linux/highmem.h> #include <linux/pagemap.h> +#include <linux/pci.h> #include <linux/pfn.h> #include <linux/poison.h> #include <linux/bootmem.h> @@ -971,6 +972,8 @@ void __init mem_init(void) start_periodic_check_for_corruption(); + pci_iommu_alloc(); + #ifdef CONFIG_FLATMEM BUG_ON(!mem_map); #endif |