Module Name: src
Committed By: martin
Date: Mon Feb 16 08:14:34 UTC 2015
Modified Files:
src/sys/arch/sh3/sh3 [netbsd-6]: locore_subr.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1254):
sys/arch/sh3/sh3/locore_subr.S: revision 1.55
port-sh3/49613: errno does not set by some systemcall at error case
Branch to correct point when error detected.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.10.1 src/sys/arch/sh3/sh3/locore_subr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sh3/sh3/locore_subr.S
diff -u src/sys/arch/sh3/sh3/locore_subr.S:1.54 src/sys/arch/sh3/sh3/locore_subr.S:1.54.10.1
--- src/sys/arch/sh3/sh3/locore_subr.S:1.54 Tue Feb 1 01:54:14 2011
+++ src/sys/arch/sh3/sh3/locore_subr.S Mon Feb 16 08:14:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.54 2011/02/01 01:54:14 uwe Exp $ */
+/* $NetBSD: locore_subr.S,v 1.54.10.1 2015/02/16 08:14:34 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sh3/mmu_sh3.h>
#include <sh3/mmu_sh4.h>
-__KERNEL_RCSID(0, "$NetBSD: locore_subr.S,v 1.54 2011/02/01 01:54:14 uwe Exp $")
+__KERNEL_RCSID(0, "$NetBSD: locore_subr.S,v 1.54.10.1 2015/02/16 08:14:34 martin Exp $")
/*
@@ -645,7 +645,7 @@ ENTRY(copyinstr)
mov.l .L_copyinstr_VM_MAXUSER_ADDRESS, r3
cmp/hi r3, r4 /* bomb if usrc isn't in user space */
- bt 4f
+ bt 5f
mov r3, r0
sub r4, r0
cmp/hi r6, r0 /* don't beyond user space */
