Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/ce586b5b2f5a
branches:  trunk
changeset: 319100:ce586b5b2f5a
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed May 16 16:33:23 2018 +0000

description:
Fix compilation on Xen.

diffstat:

 sys/arch/i386/i386/trap.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r c3bf36451dc5 -r ce586b5b2f5a sys/arch/i386/i386/trap.c
--- a/sys/arch/i386/i386/trap.c Wed May 16 13:55:39 2018 +0000
+++ b/sys/arch/i386/i386/trap.c Wed May 16 16:33:23 2018 +0000
@@ -1,5 +1,5 @@
 
-/*     $NetBSD: trap.c,v 1.294 2018/05/16 08:16:36 maxv Exp $  */
+/*     $NetBSD: trap.c,v 1.295 2018/05/16 16:33:23 maxv Exp $  */
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.294 2018/05/16 08:16:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.295 2018/05/16 16:33:23 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -128,7 +128,9 @@
 void trap(struct trapframe *);
 void trap_tss(struct i386tss *, int, int);
 void trap_return_fault_return(struct trapframe *) __dead;
+#ifndef XEN
 int ss_shadow(struct trapframe *tf);
+#endif
 
 const char * const trap_type[] = {
        "privileged instruction fault",         /*  0 T_PRIVINFLT */
@@ -237,6 +239,7 @@
            l, l->l_proc->p_pid, l->l_lid, KSTACK_LOWEST_ADDR(l));
 }
 
+#ifndef XEN
 int
 ss_shadow(struct trapframe *tf)
 {
@@ -255,6 +258,7 @@
 
        return 0;
 }
+#endif
 
 /*
  * trap(frame): exception, fault, and trap interface to BSD kernel.



Home | Main Index | Thread Index | Old Index