Module Name: src
Committed By: dyoung
Date: Tue Apr 7 18:24:23 UTC 2009
Modified Files:
src/sys/arch/i386/i386: autoconf.c
src/sys/arch/x86/conf: files.x86
src/sys/arch/x86/x86: intr.c
Log Message:
Add opt_intrdebug.h for the INTRDEBUG option, and #include it here and
there. Fixes GENERIC/i386 compilation with 'options INTRDEBUG'.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/intr.c
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/i386/i386/autoconf.c
diff -u src/sys/arch/i386/i386/autoconf.c:1.93 src/sys/arch/i386/i386/autoconf.c:1.94
--- src/sys/arch/i386/i386/autoconf.c:1.93 Tue Nov 11 14:40:18 2008
+++ src/sys/arch/i386/i386/autoconf.c Tue Apr 7 18:24:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.93 2008/11/11 14:40:18 ad Exp $ */
+/* $NetBSD: autoconf.c,v 1.94 2009/04/07 18:24:23 dyoung Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,9 +46,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.93 2008/11/11 14:40:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.94 2009/04/07 18:24:23 dyoung Exp $");
#include "opt_compat_oldboot.h"
+#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
@@ -60,6 +61,7 @@
#include <machine/pte.h>
#include <machine/cpu.h>
#include <machine/gdt.h>
+#include <machine/intr.h>
#include <machine/pcb.h>
#include <machine/cpufunc.h>
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.48 src/sys/arch/x86/conf/files.x86:1.49
--- src/sys/arch/x86/conf/files.x86:1.48 Mon Mar 30 22:20:55 2009
+++ src/sys/arch/x86/conf/files.x86 Tue Apr 7 18:24:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.48 2009/03/30 22:20:55 rmind Exp $
+# $NetBSD: files.x86,v 1.49 2009/04/07 18:24:23 dyoung Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -6,6 +6,9 @@
# MTRR support
defflag MTRR
+# Interrupt debug
+defflag opt_intrdebug.h INTRDEBUG
+
# PCI fixup options
defflag opt_pcifixup.h PCI_ADDR_FIXUP PCI_BUS_FIXUP
PCI_INTR_FIXUP PCI_INTR_FIXUP_FORCE
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.59 src/sys/arch/x86/x86/intr.c:1.60
--- src/sys/arch/x86/x86/intr.c:1.59 Tue Feb 24 06:03:55 2009
+++ src/sys/arch/x86/x86/intr.c Tue Apr 7 18:24:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.59 2009/02/24 06:03:55 yamt Exp $ */
+/* $NetBSD: intr.c,v 1.60 2009/04/07 18:24:23 dyoung Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -133,8 +133,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.59 2009/02/24 06:03:55 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.60 2009/04/07 18:24:23 dyoung Exp $");
+#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
#include "opt_acpi.h"
