From: Koen Kooi <koen@openembedded.org>
Date: Mon, 24 Aug 2009 18:25:59 +0000 (+0200)
Subject: linux-omap 2.6.29: update holes patch, make iommu modular for beagle
X-Git-Tag: Release-2010-05/1~2616^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0041be7a72a025f0f292990161fc2158c1981e6;p=openembedded.git

linux-omap 2.6.29: update holes patch, make iommu modular for beagle
---

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 7d404a4f65..163c9c901a 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r42" 
+MACHINE_KERNEL_PR = "r43" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
 +
 +static int __init meminfo_cmp(const void *_a, const void *_b) {
 +	const struct membank *a = _a, *b = _b;
-+	long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++	long cmp = bank_pfn_start(a) - bank_pfn_start(b);
 +	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
 +
  void __init bootmem_init(void)
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index 7da8bb9f2b..c9f8e9962b 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_IOMMU=y
+CONFIG_OMAP_IOMMU=m
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
diff --git a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
 +
 +static int __init meminfo_cmp(const void *_a, const void *_b) {
 +	const struct membank *a = _a, *b = _b;
-+	long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++	long cmp = bank_pfn_start(a) - bank_pfn_start(b);
 +	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
 +
  void __init bootmem_init(void)