Module Name: src
Committed By: rmind
Date: Tue Jun 22 18:26:05 UTC 2010
Modified Files:
src/sys/arch/amd64/amd64: copy.S
Log Message:
Fix ucas_32/ucas_64 on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/amd64/copy.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/amd64/amd64/copy.S
diff -u src/sys/arch/amd64/amd64/copy.S:1.16 src/sys/arch/amd64/amd64/copy.S:1.17
--- src/sys/arch/amd64/amd64/copy.S:1.16 Fri Nov 27 03:23:04 2009
+++ src/sys/arch/amd64/amd64/copy.S Tue Jun 22 18:26:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.16 2009/11/27 03:23:04 rmind Exp $ */
+/* $NetBSD: copy.S,v 1.17 2010/06/22 18:26:05 rmind Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -501,7 +501,7 @@
/* Fail if kernel-space */
movq $VM_MAXUSER_ADDRESS-8, %r8
cmpq %r8, %rdi
- ja 1f
+ ja _C_LABEL(ucas_fault)
/* Label for fault handler */
.Lucas64_start:
/* Perform the CAS */
@@ -518,9 +518,6 @@
xorq %rax, %rax
/* Clear the fault handler */
movq %rax, PCB_ONFAULT(%r8)
-1:
- /* Failure case */
- movq $EFAULT, %rax
ret
DEFERRED_SWITCH_CALL
@@ -532,7 +529,7 @@
/* Fail if kernel-space */
movq $VM_MAXUSER_ADDRESS-4, %r8
cmpq %r8, %rdi
- ja 1f
+ ja _C_LABEL(ucas_fault)
/* Label for fault handler */
.Lucas32_start:
/* Perform the CAS */
@@ -545,9 +542,6 @@
*/
movl %eax, (%rcx)
xorq %rax, %rax
-1:
- /* Failure case */
- movq $EFAULT, %rax
ret
DEFERRED_SWITCH_CALL
