commit 72d03802b8b5c841ab1da82bff0652628cbadf60
author FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Tue Nov 10 21:35:17 2009 +0900
committer Ingo Molnar <mingo@elte.hu> Tue Nov 10 14:11:32 2009 +0100
tree cd0329e3b9d6dec8585e3bfed976c9e7eee79fbf
parent 75f1cdf1dda92cae037ec848ae63690d91913eac

x86, 32-bit: Fix swiotlb boot crash

Ingo Molnar reported this boot crash:

[    8.655620] pata_amd 0000:00:06.0: version 0.4.1
[    8.660286] BUG: unable to handle kernel NULL pointer dereference at 00000034
[    8.663572] IP: [<c100617b>] dma_supported+0x3b/0xa4
[    8.663572] *pde = 00000000

Initialize dma_ops properly in the 32-bit case.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/pci-dma.c

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index a234e63..63eebee 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -129,6 +129,8 @@
 #ifdef CONFIG_X86_64
 	/* free the range so iommu could get some range less than 4G */
 	dma32_free_bootmem();
+#else
+	dma_ops = &nommu_dma_ops;
 #endif
 	pci_swiotlb_init();
 	if (use_swiotlb)