2 files changed, 10 insertions, 5 deletions

diff --git a/include/asm-ia64/intrinsics.h b/include/asm-ia64/intrinsics.h
index f1135b5b94c3..9b83f8f01678 100644
--- a/include/asm-ia64/intrinsics.h
+++ b/include/asm-ia64/intrinsics.h
@@ -18,6 +18,15 @@
 # include <asm/gcc_intrin.h>
 #endif
 
+#define ia64_set_rr0_to_rr4(val0, val1, val2, val3, val4)       \
+do {                                                            \
+        ia64_set_rr(0x0000000000000000UL, (val0));              \
+        ia64_set_rr(0x2000000000000000UL, (val1));              \
+        ia64_set_rr(0x4000000000000000UL, (val2));              \
+        ia64_set_rr(0x6000000000000000UL, (val3));              \
+        ia64_set_rr(0x8000000000000000UL, (val4));              \
+} while (0)
+
 /*
  * Force an unresolved reference if someone tries to use
  * ia64_fetch_and_add() with a bad value.
diff --git a/include/asm-ia64/mmu_context.h b/include/asm-ia64/mmu_context.h
index cef2400983fa..040bc87db930 100644
--- a/include/asm-ia64/mmu_context.h
+++ b/include/asm-ia64/mmu_context.h
@@ -152,11 +152,7 @@ reload_context (nv_mm_context_t context)
 #  endif
 #endif
 
-        ia64_set_rr(0x0000000000000000UL, rr0);
-        ia64_set_rr(0x2000000000000000UL, rr1);
-        ia64_set_rr(0x4000000000000000UL, rr2);
-        ia64_set_rr(0x6000000000000000UL, rr3);
-        ia64_set_rr(0x8000000000000000UL, rr4);
+        ia64_set_rr0_to_rr4(rr0, rr1, rr2, rr3, rr4);
         ia64_srlz_i();                  /* srlz.i implies srlz.d */
 }