diff --git a/common/lib/libc/arch/i386/atomic/atomic.S b/common/lib/libc/arch/i386/atomic/atomic.S
index 19a3adfc8f73..c6addb99d114 100644
--- a/common/lib/libc/arch/i386/atomic/atomic.S
+++ b/common/lib/libc/arch/i386/atomic/atomic.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.S,v 1.2 2007/11/28 15:24:38 ad Exp $	*/
+/*	$NetBSD: atomic.S,v 1.3 2007/11/28 18:02:29 ad Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -135,7 +135,6 @@ NENTRY(_atomic_or_32_nv)
 NENTRY(_atomic_swap_32)
 	movl	4(%esp), %edx
 	movl	8(%esp), %eax
-	LOCK(11)
 	xchgl	%eax, (%edx)
 	ret
 
@@ -193,7 +192,7 @@ atomic_lockpatch:
 	.globl	atomic_lockpatch
 	.long	.Lpatch1, .Lpatch2, .Lpatch3, .Lpatch4, .Lpatch5
 	.long	.Lpatch6, .Lpatch7, .Lpatch8, .Lpatch9, .Lpatch10
-	.long	.Lpatch11, .Lpatch12, .Lpatch13, .Lpatch14, 0
+	.long	.Lpatch12, .Lpatch13, .Lpatch14, 0
 #endif	/* _KERNEL */
 
 ALIAS(atomic_add_32,_atomic_add_32)
diff --git a/common/lib/libc/arch/x86_64/atomic/atomic.S b/common/lib/libc/arch/x86_64/atomic/atomic.S
index 3fcf44c56f3e..ba91b5a83be2 100644
--- a/common/lib/libc/arch/x86_64/atomic/atomic.S
+++ b/common/lib/libc/arch/x86_64/atomic/atomic.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.S,v 1.2 2007/11/28 15:24:38 ad Exp $	*/
+/*	$NetBSD: atomic.S,v 1.3 2007/11/28 18:02:29 ad Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -121,7 +121,6 @@ NENTRY(_atomic_or_32_nv)
 	ret
 
 NENTRY(_atomic_swap_32)
-	LOCK(11)
 	xchgl	%esi, (%rdi)
 	ret
 
@@ -203,7 +202,6 @@ NENTRY(_atomic_or_64_nv)
 	ret
 
 NENTRY(_atomic_swap_64)
-	LOCK(23)
 	xchgq	%rsi, (%rdi)
 	ret
 
@@ -261,9 +259,9 @@ atomic_lockpatch:
 	.globl	atomic_lockpatch
 	.quad	.Lpatch1, .Lpatch2, .Lpatch3, .Lpatch4, .Lpatch5
 	.quad	.Lpatch6, .Lpatch7, .Lpatch8, .Lpatch9, .Lpatch10
-	.quad	.Lpatch11, .Lpatch12, .Lpatch13, .Lpatch14, .Lpatch15
+	.quad	.Lpatch12, .Lpatch13, .Lpatch14, .Lpatch15
 	.quad	.Lpatch16, .Lpatch17, .Lpatch18, .Lpatch19, .Lpatch20
-	.quad	.Lpatch21, .Lpatch22, .Lpatch23, .Lpatch24, .Lpatch25
+	.quad	.Lpatch21, .Lpatch22, .Lpatch24, .Lpatch25
 	.quad	.Lpatch26, 0
 #endif	/* _KERNEL */