[oe-commits] Koen Kooi : linux-omap 2.6.29: update holes patch, make iommu modular for beagle

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e0041be7a72a025f0f292990161fc2158c1981e6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e0041be7a72a025f0f292990161fc2158c1981e6

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Aug 24 20:25:59 2009 +0200

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

---

 conf/machine/include/omap3.inc                     |    2 +-
 .../linux/linux-omap-2.6.29/arch-has-holes.diff    |    2 +-
 .../linux/linux-omap-2.6.29/beagleboard/defconfig  |    2 +-
 .../linux/linux-omap-pm-2.6.29/arch-has-holes.diff |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 7d404a4..163c9c9 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 82cb12c..f3935eb 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 7da8bb9..c9f8e99 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 82cb12c..f3935eb 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)