aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/mmu_context.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-08-29 18:50:32 -0400
committerTony Luck <tony.luck@intel.com>2005-08-29 18:50:32 -0400
commit329058028523a5b36de449f130111b7671a4f269 (patch)
tree7a0860f7b349d26118eac385af4c50b6d038297a /include/asm-ia64/mmu_context.h
parentbcdd3a911499abd65bf1f123b2a6ad9c1d5611ea (diff)
parent1b66776da71e33dff5edcc0b096ec3b7c40c75ad (diff)
Pull rationalise-regions into release branch
Diffstat (limited to 'include/asm-ia64/mmu_context.h')
-rw-r--r--include/asm-ia64/mmu_context.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-ia64/mmu_context.h b/include/asm-ia64/mmu_context.h
index 0680d163be97..8d6e72f7b08e 100644
--- a/include/asm-ia64/mmu_context.h
+++ b/include/asm-ia64/mmu_context.h
@@ -19,6 +19,7 @@
19 19
20#define ia64_rid(ctx,addr) (((ctx) << 3) | (addr >> 61)) 20#define ia64_rid(ctx,addr) (((ctx) << 3) | (addr >> 61))
21 21
22# include <asm/page.h>
22# ifndef __ASSEMBLY__ 23# ifndef __ASSEMBLY__
23 24
24#include <linux/compiler.h> 25#include <linux/compiler.h>
@@ -122,7 +123,7 @@ reload_context (nv_mm_context_t context)
122 unsigned long rid_incr = 0; 123 unsigned long rid_incr = 0;
123 unsigned long rr0, rr1, rr2, rr3, rr4, old_rr4; 124 unsigned long rr0, rr1, rr2, rr3, rr4, old_rr4;
124 125
125 old_rr4 = ia64_get_rr(0x8000000000000000UL); 126 old_rr4 = ia64_get_rr(RGN_BASE(RGN_HPAGE));
126 rid = context << 3; /* make space for encoding the region number */ 127 rid = context << 3; /* make space for encoding the region number */
127 rid_incr = 1 << 8; 128 rid_incr = 1 << 8;
128 129
@@ -134,6 +135,10 @@ reload_context (nv_mm_context_t context)
134 rr4 = rr0 + 4*rid_incr; 135 rr4 = rr0 + 4*rid_incr;
135#ifdef CONFIG_HUGETLB_PAGE 136#ifdef CONFIG_HUGETLB_PAGE
136 rr4 = (rr4 & (~(0xfcUL))) | (old_rr4 & 0xfc); 137 rr4 = (rr4 & (~(0xfcUL))) | (old_rr4 & 0xfc);
138
139# if RGN_HPAGE != 4
140# error "reload_context assumes RGN_HPAGE is 4"
141# endif
137#endif 142#endif
138 143
139 ia64_set_rr(0x0000000000000000UL, rr0); 144 ia64_set_rr(0x0000000000000000UL, rr0);