From e8efa44119a4f71215ffaa58e1adc744692a97c9 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 19 May 2008 22:13:30 +0900 Subject: [PATCH] --- yaml --- r: 104504 b: refs/heads/master c: 0e1a77ccdbc4ca59ccaf84168a0c3c1df4fadfc0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/intrinsics.h | 9 +++++++++ trunk/include/asm-ia64/mmu_context.h | 6 +----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index defc2c986d7e..c07af094f580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8311d21c35092aa4c4a12e0140e1ef3443489d77 +refs/heads/master: 0e1a77ccdbc4ca59ccaf84168a0c3c1df4fadfc0 diff --git a/trunk/include/asm-ia64/intrinsics.h b/trunk/include/asm-ia64/intrinsics.h index f1135b5b94c3..9b83f8f01678 100644 --- a/trunk/include/asm-ia64/intrinsics.h +++ b/trunk/include/asm-ia64/intrinsics.h @@ -18,6 +18,15 @@ # include #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/trunk/include/asm-ia64/mmu_context.h b/trunk/include/asm-ia64/mmu_context.h index cef2400983fa..040bc87db930 100644 --- a/trunk/include/asm-ia64/mmu_context.h +++ b/trunk/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 */ }