Module Name: src
Committed By: maxv
Date: Sat Aug 27 14:12:58 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/amd64/include: segments.h
Log Message:
Rename this value, and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amd64/include/segments.h
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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.226 src/sys/arch/amd64/amd64/machdep.c:1.227
--- src/sys/arch/amd64/amd64/machdep.c:1.226 Fri Jul 22 14:08:33 2016
+++ src/sys/arch/amd64/amd64/machdep.c Sat Aug 27 14:12:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.226 2016/07/22 14:08:33 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.227 2016/08/27 14:12:58 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.226 2016/07/22 14:08:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.227 2016/08/27 14:12:58 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -1714,8 +1714,8 @@ init_x86_64(paddr_t first_avail)
(struct gate_descriptor *)(ldtstore + LSYS5CALLS_SEL),
sizeof (struct gate_descriptor));
- /* exceptions */
- for (x = 0; x < 32; x++) {
+ /* CPU-specific IDT exceptions. */
+ for (x = 0; x < NCPUIDT; x++) {
#ifndef XEN
idt_vec_reserve(x);
switch (x) {
Index: src/sys/arch/amd64/include/segments.h
diff -u src/sys/arch/amd64/include/segments.h:1.25 src/sys/arch/amd64/include/segments.h:1.26
--- src/sys/arch/amd64/include/segments.h:1.25 Sun Aug 21 11:48:59 2016
+++ src/sys/arch/amd64/include/segments.h Sat Aug 27 14:12:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: segments.h,v 1.25 2016/08/21 11:48:59 maxv Exp $ */
+/* $NetBSD: segments.h,v 1.26 2016/08/27 14:12:58 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -331,7 +331,7 @@ void cpu_fsgs_reload(struct lwp *, int,
* Entries in the Interrupt Descriptor Table (IDT)
*/
#define NIDT 256
-#define NRSVIDT 32 /* reserved entries for CPU exceptions */
+#define NCPUIDT 32 /* reserved entries for CPU exceptions */
/*
* Entries in the Global Descriptor Table (GDT)
