Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[powerpc.git] / include / asm-sh / mmu.h

diff --git a/include/asm-sh/mmu.h b/include/asm-sh/mmu.h
index ec09589..cf47df7 100644 (file)
--- a/include/asm-sh/mmu.h
+++ b/include/asm-sh/mmu.h
@@ -3,26 +3,20 @@
 
 #if !defined(CONFIG_MMU)
 
-struct mm_rblock_struct {
-       int     size;
-       int     refcount;
-       void    *kblock;
-};
-
-struct mm_tblock_struct {
-       struct mm_rblock_struct *rblock;
-       struct mm_tblock_struct *next;
-};
-
 typedef struct {
-       struct mm_tblock_struct tblock;
+       struct vm_list_struct   *vmlist;
        unsigned long           end_brk;
 } mm_context_t;
 
 #else
 
 /* Default "unsigned long" context */
-typedef unsigned long mm_context_t;
+typedef unsigned long mm_context_id_t;
+
+typedef struct {
+       mm_context_id_t id;
+       void *vdso;
+} mm_context_t;
 
 #endif /* CONFIG_MMU */