diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index a226069fd..8353e1b04 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -3,10 +3,27 @@
 	/* FIXME: This should invalidate only part of memory.  */
 FUNCTION (grub_cpu_flush_cache)
 FUNCTION (grub_arch_sync_caches)
-repeat:
-	cache 1, 0($a0)
-	cache 0, 0($a0)
-	addiu $a0, $a0, 1
-	addiu $a1, $a1, 0xffff
-	bne $a1, $zero, repeat
-	j $31
+	move $t2, $a0
+	addu $t3, $a0, $a1
+	srl $t2, $t2, 5
+	sll $t2, $t2, 5
+	addu $t3, $t3, 0x1f
+	srl $t3, $t3, 5
+	sll $t3, $t3, 5
+	move $t0, $t2
+	subu $t1, $t3, $t2
+r1:
+	cache 1, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, r1
+	sync
+	move $t0, $t2
+	subu $t1, $t3, $t2
+r2:
+	cache 0, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, r2
+	sync
+	j $ra
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 61c93e39f..796473bf7 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -81,7 +81,7 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
   grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }
@@ -101,7 +101,7 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
   grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }