* 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 5279dac50d0fed5097d487a6434b6cbb5b642fdc..75d0f7480c04012c0f9f9acb4f57b0bf9877e46c 100644 (file)
--- 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 f78d070a2ea9d69298a6d21a9d8a6430b9ca3b3d..5775afab72c8038fff3bd7b4cf5151bf6318074c 100644 (file)
--- 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: