Skip to contentSkip to conversation

x86 fixes

GIT PULL Ingo Molnar 1 participant 1 message Jul 29, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus

the iommu patch undoes the build breakage to Sparc introduced yesterday.

out-of-topic modifications in x86-fixes-for-linus:
--------------------------------------------------

include/linux/iommu-helper.h       # 8978b74: generic, x86: fix add iommu_num_p
init/calibrate.c                   # d7ba11d: x86: remove stray <6> in BogoMIPS
lib/iommu-helper.c                 # 8978b74: generic, x86: fix add iommu_num_p

Thanks,

Ingo

------------------>
Bernhard Walle (1):
x86: move dma32_reserve_bootmem() after reserve_crashkernel()

FUJITA Tomonori (1):
generic, x86: fix add iommu_num_pages helper function

Joe Perches (1):
x86: remove stray <6> in BogoMIPS printk

 arch/x86/kernel/pci-dma.c    |    8 ++++++++
 arch/x86/kernel/setup.c      |   13 +++++++++----
 include/asm-x86/iommu.h      |    2 ++
 include/linux/iommu-helper.h |    1 -
 init/calibrate.c             |    2 +-
 lib/iommu-helper.c           |    8 --------
 6 files changed, 20 insertions(+), 14 deletions(-)
arch/x86/kernel/pci-dma.c +8 -0
index 8dbffb8..87d4d69 100644
@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void)
 
 	pci_swiotlb_init();
 }
+
+unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
+{
+	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
+
+	return size >> PAGE_SHIFT;
+}
+EXPORT_SYMBOL(iommu_num_pages);
 #endif
 
 /*
arch/x86/kernel/setup.c +9 -4
index b520dae..2d88858 100644
@@ -788,10 +788,6 @@ void __init setup_arch(char **cmdline_p)
 
 	initmem_init(0, max_pfn);
 
-#ifdef CONFIG_X86_64
-	dma32_reserve_bootmem();
-#endif
-
 #ifdef CONFIG_ACPI_SLEEP
 	/*
 	 * Reserve low memory region for sleep support.
@@ -806,6 +802,15 @@ void __init setup_arch(char **cmdline_p)
 #endif
 	reserve_crashkernel();
 
+#ifdef CONFIG_X86_64
+	/*
+	 * dma32_reserve_bootmem() allocates bootmem which may conflict
+	 * with the crashkernel command line, so do that after
+	 * reserve_crashkernel()
+	 */
+	dma32_reserve_bootmem();
+#endif
+
 	reserve_ibft_region();
 
 #ifdef CONFIG_KVM_CLOCK
include/asm-x86/iommu.h +2 -0
index ecc8061..5f888cc 100644
@@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
 
+extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
+
 #ifdef CONFIG_GART_IOMMU
 extern int gart_iommu_aperture;
 extern int gart_iommu_aperture_allowed;
include/linux/iommu-helper.h +0 -1
index f8598f5..c975caf 100644
@@ -8,4 +8,3 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
 				      unsigned long align_mask);
 extern void iommu_area_free(unsigned long *map, unsigned long start,
 			    unsigned int nr);
-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
init/calibrate.c +1 -1
index 7963e3f..a379c90 100644
@@ -170,7 +170,7 @@ void __cpuinit calibrate_delay(void)
 				loops_per_jiffy &= ~loopbit;
 		}
 	}
-	printk(KERN_INFO "%lu.%02lu BogoMIPS (lpj=%lu)\n",
+	printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n",
 			loops_per_jiffy/(500000/HZ),
 			(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
 }
lib/iommu-helper.c +0 -8
index 889ddce..a3b8d4c 100644
@@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
 	}
 }
 EXPORT_SYMBOL(iommu_area_free);
-
-unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
-{
-	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
-
-	return size >> PAGE_SHIFT;
-}
-EXPORT_SYMBOL(iommu_num_pages);