Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/asm-v850/mmu.h b/include/asm-v850/mmu.h
index e30a52b..267768c 100644 (file)
--- a/include/asm-v850/mmu.h
+++ b/include/asm-v850/mmu.h
@@ -1,22 +1,11 @@
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
+/* Copyright (C) 2002, 2005, David McCullough <davidm@snapgear.com> */
 
 #ifndef __V850_MMU_H__
 #define __V850_MMU_H__
 
-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;
-       unsigned long                   end_brk;
+       struct vm_list_struct   *vmlist;
+       unsigned long           end_brk;
 } mm_context_t;
 
 #endif /* __V850_MMU_H__ */