diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 10:27:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 18:43:06 +0200 |
| commit | 6c738ffa9fea6869f5d51882dfefbba746e432b1 (patch) | |
| tree | e9b30ccd149f73676422ea5519d6572a3f8e2819 /arch/um/kernel/skas | |
| parent | uml: get rid of do_longjmp (diff) | |
| download | linux-6c738ffa9fea6869f5d51882dfefbba746e432b1.tar.xz linux-6c738ffa9fea6869f5d51882dfefbba746e432b1.zip | |
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/kernel/skas')
| -rw-r--r-- | arch/um/kernel/skas/mmu.c | 12 | ||||
| -rw-r--r-- | arch/um/kernel/skas/process.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index c5475ecd9fd4..48c8c136c038 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c @@ -47,9 +47,9 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, * destroy_context_skas. */ - mm->context.skas.last_page_table = pmd_page_vaddr(*pmd); + mm->context.last_page_table = pmd_page_vaddr(*pmd); #ifdef CONFIG_3_LEVEL_PGTABLES - mm->context.skas.last_pmd = (unsigned long) __va(pud_val(*pud)); + mm->context.last_pmd = (unsigned long) __va(pud_val(*pud)); #endif *pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT)); @@ -66,8 +66,8 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, int init_new_context(struct task_struct *task, struct mm_struct *mm) { - struct mmu_context_skas *from_mm = NULL; - struct mmu_context_skas *to_mm = &mm->context.skas; + struct mm_context *from_mm = NULL; + struct mm_context *to_mm = &mm->context; unsigned long stack = 0; int ret = -ENOMEM; @@ -97,7 +97,7 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm) to_mm->id.stack = stack; if (current->mm != NULL && current->mm != &init_mm) - from_mm = ¤t->mm->context.skas; + from_mm = ¤t->mm->context; if (proc_mm) { ret = new_mm(stack); @@ -133,7 +133,7 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm) void destroy_context(struct mm_struct *mm) { - struct mmu_context_skas *mmu = &mm->context.skas; + struct mm_context *mmu = &mm->context; if (proc_mm) os_close_file(mmu->id.u.mm_fd); diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 9ce1c49421f8..0297e63f9725 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c @@ -65,5 +65,5 @@ unsigned long current_stub_stack(void) if (current->mm == NULL) return 0; - return current->mm->context.skas.id.stack; + return current->mm->context.id.stack; } |