aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386/ldt.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:27:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:06 -0400
commit6c738ffa9fea6869f5d51882dfefbba746e432b1 (patch)
treee9b30ccd149f73676422ea5519d6572a3f8e2819 /arch/um/sys-i386/ldt.c
parentfab95c55e3b94e219044dc7a558632d08c198771 (diff)
uml: fold mmu_context_skas into mm_context
This patch folds mmu_context_skas into struct mm_context, changing all users of these structures as needed. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/sys-i386/ldt.c')
-rw-r--r--arch/um/sys-i386/ldt.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 0bf7572a80a3..67c0958eb984 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -33,7 +33,7 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc,
33 * Note: I'm unsure: should interrupts be disabled here? 33 * Note: I'm unsure: should interrupts be disabled here?
34 */ 34 */
35 if (!current->active_mm || current->active_mm == &init_mm || 35 if (!current->active_mm || current->active_mm == &init_mm ||
36 mm_idp != &current->active_mm->context.skas.id) 36 mm_idp != &current->active_mm->context.id)
37 __switch_mm(mm_idp); 37 __switch_mm(mm_idp);
38 } 38 }
39 39
@@ -79,8 +79,8 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc,
79 * PTRACE_LDT possible to implement. 79 * PTRACE_LDT possible to implement.
80 */ 80 */
81 if (current->active_mm && current->active_mm != &init_mm && 81 if (current->active_mm && current->active_mm != &init_mm &&
82 mm_idp != &current->active_mm->context.skas.id) 82 mm_idp != &current->active_mm->context.id)
83 __switch_mm(&current->active_mm->context.skas.id); 83 __switch_mm(&current->active_mm->context.id);
84 } 84 }
85 85
86 return res; 86 return res;
@@ -135,7 +135,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount)
135{ 135{
136 int i, err = 0; 136 int i, err = 0;
137 unsigned long size; 137 unsigned long size;
138 uml_ldt_t * ldt = &current->mm->context.skas.ldt; 138 uml_ldt_t * ldt = &current->mm->context.ldt;
139 139
140 if (!ldt->entry_count) 140 if (!ldt->entry_count)
141 goto out; 141 goto out;
@@ -203,8 +203,8 @@ static int read_default_ldt(void __user * ptr, unsigned long bytecount)
203 203
204static int write_ldt(void __user * ptr, unsigned long bytecount, int func) 204static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
205{ 205{
206 uml_ldt_t * ldt = &current->mm->context.skas.ldt; 206 uml_ldt_t * ldt = &current->mm->context.ldt;
207 struct mm_id * mm_idp = &current->mm->context.skas.id; 207 struct mm_id * mm_idp = &current->mm->context.id;
208 int i, err; 208 int i, err;
209 struct user_desc ldt_info; 209 struct user_desc ldt_info;
210 struct ldt_entry entry0, *ldt_p; 210 struct ldt_entry entry0, *ldt_p;
@@ -384,8 +384,7 @@ out_free:
384 free_pages((unsigned long)ldt, order); 384 free_pages((unsigned long)ldt, order);
385} 385}
386 386
387long init_new_ldt(struct mmu_context_skas * new_mm, 387long init_new_ldt(struct mm_context *new_mm, struct mm_context *from_mm)
388 struct mmu_context_skas * from_mm)
389{ 388{
390 struct user_desc desc; 389 struct user_desc desc;
391 short * num_p; 390 short * num_p;
@@ -483,7 +482,7 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
483} 482}
484 483
485 484
486void free_ldt(struct mmu_context_skas * mm) 485void free_ldt(struct mm_context *mm)
487{ 486{
488 int i; 487 int i;
489 488