
From: David Howells <dhowells@redhat.com>

The attached patch changes the nommu bits of the FRV arch to incorporate the
name changes made to the nommu core stuff.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/frv/kernel/ptrace.c |    6 +++---
 25-akpm/include/asm-frv/mmu.h    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN arch/frv/kernel/ptrace.c~frv-arch-nommu-changes arch/frv/kernel/ptrace.c
--- 25/arch/frv/kernel/ptrace.c~frv-arch-nommu-changes	2004-11-16 23:41:34.711634408 -0800
+++ 25-akpm/arch/frv/kernel/ptrace.c	2004-11-16 23:41:34.717633496 -0800
@@ -87,10 +87,10 @@ static inline int is_user_addr_valid(str
 		return -EIO;
 	return 0;
 #else
-	struct mm_tblock_struct *tblock;
+	struct vm_list_struct *vml;
 
-	for (tblock = child->mm->context.tblock; tblock; tblock = tblock->next)
-		if (start >= tblock->vma->vm_start && start + len <= tblock->vma->vm_end)
+	for (vml = child->mm->context.vmlist; vml; vml = vml->next)
+		if (start >= vml->vma->vm_start && start + len <= vml->vma->vm_end)
 			return 0;
 
 	return -EIO;
diff -puN include/asm-frv/mmu.h~frv-arch-nommu-changes include/asm-frv/mmu.h
--- 25/include/asm-frv/mmu.h~frv-arch-nommu-changes	2004-11-16 23:41:34.712634256 -0800
+++ 25-akpm/include/asm-frv/mmu.h	2004-11-16 23:41:34.718633344 -0800
@@ -22,7 +22,7 @@ typedef struct {
 	unsigned long	dtlb_ptd_mapping;	/* [DAMR5] PTD mapping for dtlb cached PGE */
 
 #else
-	struct mm_tblock_struct	*tblock;
+	struct vm_list_struct	*vmlist;
 	unsigned long		end_brk;
 
 #endif
_
