[src/trunk]: src/sys/arch Add ist0 to pcpu_entry.

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

details:   https://anonhg.NetBSD.org/src/rev/6fefe0ea678a
branches:  trunk
changeset: 828952:6fefe0ea678a
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Jan 11 10:38:13 2018 +0000

description:
Add ist0 to pcpu_entry.

diffstat:

 sys/arch/amd64/amd64/machdep.c |  8 ++++++--
 sys/arch/x86/include/pmap.h    |  3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 69e2aa0b7ec5 -r 6fefe0ea678a sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Thu Jan 11 10:30:26 2018 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Thu Jan 11 10:38:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.287 2018/01/11 10:30:26 maxv Exp $       */
+/*     $NetBSD: machdep.c,v 1.288 2018/01/11 10:38:13 maxv Exp $       */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.287 2018/01/11 10:30:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.288 2018/01/11 10:38:13 maxv Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -522,7 +522,11 @@
        cputss->tss.tss_iobase = IOMAP_INVALOFF << 16;
 
        /* DDB stack */
+#ifdef __HAVE_PCPU_AREA
+       p = (vaddr_t)&pcpuarea->ent[cid].ist0;
+#else
        p = uvm_km_alloc(kernel_map, PAGE_SIZE, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
+#endif
        cputss->tss.tss_ist[0] = p + PAGE_SIZE - 16;
 
        /* double fault */
diff -r 69e2aa0b7ec5 -r 6fefe0ea678a sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Thu Jan 11 10:30:26 2018 +0000
+++ b/sys/arch/x86/include/pmap.h       Thu Jan 11 10:38:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.73 2018/01/05 08:04:21 maxv Exp $   */
+/*     $NetBSD: pmap.h,v 1.74 2018/01/11 10:38:13 maxv Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -160,6 +160,7 @@
 struct pcpu_entry {
        uint8_t gdt[MAXGDTSIZ];
        uint8_t tss[PAGE_SIZE];
+       uint8_t ist0[PAGE_SIZE];
        uint8_t ist1[PAGE_SIZE];
        uint8_t ist2[PAGE_SIZE];
 } __packed;