From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261834AbUKPTkw (ORCPT ); Tue, 16 Nov 2004 14:40:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262124AbUKPTi5 (ORCPT ); Tue, 16 Nov 2004 14:38:57 -0500 Received: from mx1.redhat.com ([66.187.233.31]:55439 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S262097AbUKPTgS (ORCPT ); Tue, 16 Nov 2004 14:36:18 -0500 From: David Howells To: akpm@osdl.org, torvalds@osdl.org, davidm@snapgear.com, hch@infradead.org cc: linux-kernel@vger.kernel.org, uclinux-dev@uclinux.org Subject: [PATCH 3/3] FRV-arch nommu changes User-Agent: EMH/1.14.1 SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/21.3 (i386-redhat-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII Date: Tue, 16 Nov 2004 19:36:06 +0000 Message-ID: <3620.1100633766@redhat.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- warthog>diffstat nommu-frv-2610rc2mm1.diff arch/frv/kernel/ptrace.c | 6 +++--- include/asm-frv/mmu.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -uNrp /warthog/kernels/linux-2.6.10-rc2-mm1/arch/frv/kernel/ptrace.c linux-2.6.10-rc2-mm1-frv/arch/frv/kernel/ptrace.c --- /warthog/kernels/linux-2.6.10-rc2-mm1/arch/frv/kernel/ptrace.c 2004-11-16 11:31:18.684966548 +0000 +++ linux-2.6.10-rc2-mm1-frv/arch/frv/kernel/ptrace.c 2004-11-16 16:38:04.650376432 +0000 @@ -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 -uNrp /warthog/kernels/linux-2.6.10-rc2-mm1/include/asm-frv/mmu.h linux-2.6.10-rc2-mm1-frv/include/asm-frv/mmu.h --- /warthog/kernels/linux-2.6.10-rc2-mm1/include/asm-frv/mmu.h 2004-11-16 11:31:44.793791239 +0000 +++ linux-2.6.10-rc2-mm1-frv/include/asm-frv/mmu.h 2004-11-16 16:39:14.354588536 +0000 @@ -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