[src/trunk]: src/sys/arch/i386/i386 Analagous fix to that just committed to t...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b470f6f398b0
branches:  trunk
changeset: 351277:b470f6f398b0
user:      kre <kre%NetBSD.org@localhost>
date:      Wed Feb 08 18:53:01 2017 +0000

description:
Analagous fix to that just committed to the equiv amd64 sources.
Note: this one has yet to be compile tested, so anything is possible...

diffstat:

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

diffs (44 lines):

diff -r e385059fc983 -r b470f6f398b0 sys/arch/i386/i386/gdt.c
--- a/sys/arch/i386/i386/gdt.c  Wed Feb 08 18:50:51 2017 +0000
+++ b/sys/arch/i386/i386/gdt.c  Wed Feb 08 18:53:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gdt.c,v 1.59 2017/02/08 10:08:26 maxv Exp $    */
+/*     $NetBSD: gdt.c,v 1.60 2017/02/08 18:53:01 kre Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.59 2017/02/08 10:08:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.60 2017/02/08 18:53:01 kre Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -60,7 +60,9 @@
 static int ldt_count;  /* number of LDTs */
 static int ldt_max = 1000;/* max number of LDTs */
 
+#ifndef XEN
 static void setgdt(int, const void *, size_t, int, int, int, int);
+#endif
 void gdt_init(void);
 static void gdt_grow(int);
 static int gdt_get_slot1(int);
@@ -82,6 +84,7 @@
 #endif
 }
 
+#ifndef XEN
 /*
  * Called on a newly-allocated GDT slot, so no race between CPUs.
  */
@@ -106,6 +109,7 @@
                            (union descriptor *)sd);
        }
 }
+#endif
 
 /*
  * Initialize the GDT. We already have a gdtstore, which was temporarily used