From owner-svn-src-all@FreeBSD.ORG  Sat Aug  4 05:38:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 80805106564A;
	Sat,  4 Aug 2012 05:38:26 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B2478FC0C;
	Sat,  4 Aug 2012 05:38:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q745cQPC014917;
	Sat, 4 Aug 2012 05:38:26 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q745cQDP014914;
	Sat, 4 Aug 2012 05:38:26 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201208040538.q745cQDP014914@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 4 Aug 2012 05:38:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239033 - head/sys/arm/arm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2012 05:38:26 -0000

Author: andrew
Date: Sat Aug  4 05:38:25 2012
New Revision: 239033
URL: http://svn.freebsd.org/changeset/base/239033

Log:
  Correctly return EFAULT in copyin & copyout on a fault. This fixes NFS
  when running FreeBSD on QEMU emulating a Gumstix board.
  
  While here remove the use of a magic number in the not-XScale version.
  
  Pointed out by:	kib
  Reviewed by:	stas

Modified:
  head/sys/arm/arm/bcopyinout.S
  head/sys/arm/arm/bcopyinout_xscale.S

Modified: head/sys/arm/arm/bcopyinout.S
==============================================================================
--- head/sys/arm/arm/bcopyinout.S	Sat Aug  4 05:31:26 2012	(r239032)
+++ head/sys/arm/arm/bcopyinout.S	Sat Aug  4 05:38:25 2012	(r239033)
@@ -39,6 +39,7 @@
 #include "assym.s"
 
 #include <machine/asm.h>
+#include <sys/errno.h>
 
 .L_arm_memcpy:
 	.word	_C_LABEL(_arm_memcpy)
@@ -310,7 +311,7 @@ ENTRY(copyin)
 	RET
 
 .Lcopyfault:
-	mov	r0, #14 /* EFAULT */
+	ldr	r0, =EFAULT
 	str	r5, [r4, #PCB_ONFAULT]
 	RESTORE_REGS
 

Modified: head/sys/arm/arm/bcopyinout_xscale.S
==============================================================================
--- head/sys/arm/arm/bcopyinout_xscale.S	Sat Aug  4 05:31:26 2012	(r239032)
+++ head/sys/arm/arm/bcopyinout_xscale.S	Sat Aug  4 05:38:25 2012	(r239033)
@@ -108,6 +108,7 @@ ENTRY(copyin)
 	ldmfd	sp!, {r10-r11, pc}
 
 .Lcopyin_fault:
+	ldr	r0, =EFAULT
 	str	r11, [r10, #PCB_ONFAULT]
 	cmp	r3, #0x00
 	ldmgtfd	sp!, {r4-r7}		/* r3 > 0 Restore r4-r7 */
@@ -559,6 +560,7 @@ ENTRY(copyout)
 	ldmfd	sp!, {r10-r11, pc}
 
 .Lcopyout_fault:
+	ldr	r0, =EFAULT
 	str	r11, [r10, #PCB_ONFAULT]
 	cmp	r3, #0x00
 	ldmgtfd	sp!, {r4-r7}		/* r3 > 0 Restore r4-r7 */