diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:06 -0700 |
| commit | 6c738ffa9fea6869f5d51882dfefbba746e432b1 (patch) | |
| tree | e9b30ccd149f73676422ea5519d6572a3f8e2819 /include/asm-um | |
| parent | fab95c55e3b94e219044dc7a558632d08c198771 (diff) | |
| download | linux-stable-6c738ffa9fea6869f5d51882dfefbba746e432b1.tar.gz linux-stable-6c738ffa9fea6869f5d51882dfefbba746e432b1.tar.bz2 linux-stable-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 'include/asm-um')
| -rw-r--r-- | include/asm-um/ldt.h | 4 | ||||
| -rw-r--r-- | include/asm-um/mmu_context.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt.h index 96f82a456ce6..b2553f3e87eb 100644 --- a/include/asm-um/ldt.h +++ b/include/asm-um/ldt.h @@ -11,11 +11,7 @@ #include "asm/semaphore.h" #include "asm/host_ldt.h" -struct mmu_context_skas; extern void ldt_host_info(void); -extern long init_new_ldt(struct mmu_context_skas * to_mm, - struct mmu_context_skas * from_mm); -extern void free_ldt(struct mmu_context_skas * mm); #define LDT_PAGES_MAX \ ((LDT_ENTRIES * LDT_ENTRY_SIZE)/PAGE_SIZE) diff --git a/include/asm-um/mmu_context.h b/include/asm-um/mmu_context.h index 035fd1c363ea..5f3b863aef9a 100644 --- a/include/asm-um/mmu_context.h +++ b/include/asm-um/mmu_context.h @@ -29,7 +29,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new) * possible. */ if (old != new && (current->flags & PF_BORROWED_MM)) - __switch_mm(&new->context.skas.id); + __switch_mm(&new->context.id); } static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, @@ -41,7 +41,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, cpu_clear(cpu, prev->cpu_vm_mask); cpu_set(cpu, next->cpu_vm_mask); if(next != &init_mm) - __switch_mm(&next->context.skas.id); + __switch_mm(&next->context.id); } } |