Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 Fix LOCKDEBUG compilation on i386.



details:   https://anonhg.NetBSD.org/src/rev/a4bb894876d6
branches:  trunk
changeset: 971885:a4bb894876d6
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu May 07 18:13:05 2020 +0000

description:
Fix LOCKDEBUG compilation on i386.

diffstat:

 sys/arch/x86/x86/patch.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r df14963d4026 -r a4bb894876d6 sys/arch/x86/x86/patch.c
--- a/sys/arch/x86/x86/patch.c  Thu May 07 18:02:48 2020 +0000
+++ b/sys/arch/x86/x86/patch.c  Thu May 07 18:13:05 2020 +0000
@@ -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 @@
 __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 @@
 };
 __link_set_add_rodata(x86_hotpatch_descriptors, hp_i686_mutex_spin_exit_desc);
 #endif
+#endif
 
 /* -------------------------------------------------------------------------- */
 



Home | Main Index | Thread Index | Old Index