From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Dec 2013 21:33:35 +0000 (+0100)
Subject: 	* grub-core/kern/arm/cache.c (grub_arm_disable_caches_mmu): Use v6
X-Git-Tag: grub-2.02-beta2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adabfb5418e8688a5ec754c811f99f504590d919;p=thirdparty%2Fgrub.git

	* grub-core/kern/arm/cache.c (grub_arm_disable_caches_mmu): Use v6
	algorithm on v5.

	Suggested by: Leif Lindholm.
---

diff --git a/ChangeLog b/ChangeLog
index 5279dac50..75d0f7480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/arm/cache.c (grub_arm_disable_caches_mmu): Use v6
+	algorithm on v5.
+
+	Suggested by: Leif Lindholm.
+
 2013-12-22  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* util/grub-mkconfig.in: Fix Xen platform conditions.
diff --git a/grub-core/kern/arm/cache.c b/grub-core/kern/arm/cache.c
index f78d070a2..5775afab7 100644
--- a/grub-core/kern/arm/cache.c
+++ b/grub-core/kern/arm/cache.c
@@ -114,15 +114,13 @@ grub_arm_disable_caches_mmu (void)
     probe_caches ();
   switch (type)
     {
+    case ARCH_ARMV5_WRITE_THROUGH:
     case ARCH_ARMV6_UNIFIED:
     case ARCH_ARMV6:
       grub_arm_disable_caches_mmu_armv6 ();
       break;
     case ARCH_ARMV7:
       grub_arm_disable_caches_mmu_armv7 ();
-      break;
-      /* Nothing to do.  */
-    case ARCH_ARMV5_WRITE_THROUGH:
       break;
       /* Pacify GCC.  */
     case ARCH_UNKNOWN: