Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/patch.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/patch.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.2.16.2
diff -u -p -r1.2 -r1.2.16.2
--- src/sys/arch/x86/x86/patch.c	2007/02/09 21:55:14	1.2
+++ src/sys/arch/x86/x86/patch.c	2007/10/03 19:25:56	1.2.16.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: patch.c,v 1.2 2007/02/09 21:55:14 ad Exp $	*/
+/*	$NetBSD: patch.c,v 1.2.16.2 2007/10/03 19:25:56 garbled Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.2 2007/02/09 21:55:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.2.16.2 2007/10/03 19:25:56 garbled Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
@@ -68,7 +68,6 @@ void	amd64_spllower(int);
 void	amd64_spllower_end(void);
 void	amd64_spllower_patch(void);
 
-void	mutex_spin_exit(int);
 void	mutex_spin_exit_end(void);
 void	i686_mutex_spin_exit(int);
 void	i686_mutex_spin_exit_end(void);
@@ -105,8 +104,8 @@ patchfunc(void *from_s, void *from_e, vo
 	    (uintptr_t)to_e - (uintptr_t)to_s)
 		panic("patchfunc: sizes do not match (from=%p)", from_s);
 
-	psl = read_psl();
-	disable_intr();
+	psl = x86_read_psl();
+	x86_disable_intr();
 	memcpy(to_s, from_s, (uintptr_t)to_e - (uintptr_t)to_s);
 	if (pcrel != NULL) {
 		ptr = pcrel;
@@ -121,7 +120,7 @@ patchfunc(void *from_s, void *from_e, vo
 		    ((uint32_t)(uintptr_t)from_s - (uint32_t)(uintptr_t)to_s);
 	}
 	x86_flush();
-	write_psl(psl);
+	x86_write_psl(psl);
 }
 
 static inline void  __attribute__ ((__unused__))