Module Name:    src
Committed By:   maxv
Date:           Thu May  7 18:13:05 UTC 2020

Modified Files:
        src/sys/arch/x86/x86: patch.c

Log Message:
Fix LOCKDEBUG compilation on i386.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/x86/patch.c

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/x86/x86/patch.c
diff -u src/sys/arch/x86/x86/patch.c:1.48 src/sys/arch/x86/x86/patch.c:1.49
--- src/sys/arch/x86/x86/patch.c:1.48	Sat May  2 16:25:47 2020
+++ src/sys/arch/x86/x86/patch.c	Thu May  7 18:13:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: patch.c,v 1.48 2020/05/02 16:25:47 maxv Exp $	*/
+/*	$NetBSD: patch.c,v 1.49 2020/05/07 18:13:05 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.48 2020/05/02 16:25:47 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.49 2020/05/07 18:13:05 maxv Exp $");
 
 #include "opt_lockdebug.h"
 #ifdef i386
@@ -171,6 +171,7 @@ static const struct x86_hotpatch_descrip
 __link_set_add_rodata(x86_hotpatch_descriptors, hp_cx8_spllower_desc);
 
 /* MUTEX_EXIT. */
+#ifndef LOCKDEBUG
 extern uint8_t i686_mutex_spin_exit, i686_mutex_spin_exit_end;
 static const struct x86_hotpatch_source hp_i686_mutex_spin_exit_source = {
 	.saddr = &i686_mutex_spin_exit,
@@ -183,6 +184,7 @@ static const struct x86_hotpatch_descrip
 };
 __link_set_add_rodata(x86_hotpatch_descriptors, hp_i686_mutex_spin_exit_desc);
 #endif
+#endif
 
 /* -------------------------------------------------------------------------- */
 

Reply via email to