Module Name: src
Committed By: riz
Date: Sun Nov 21 02:46:24 UTC 2010
Modified Files:
src/sys/arch/i386/i386 [netbsd-5]: autoconf.c
src/sys/arch/x86/conf [netbsd-5]: files.x86
src/sys/arch/x86/x86 [netbsd-5]: intr.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1403):
sys/arch/x86/conf/files.x86: revision 1.49
sys/arch/i386/i386/autoconf.c: revision 1.94
sys/arch/x86/x86/intr.c: revision 1.60
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.92.8.1 -r1.92.8.2 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.44.4.2 -r1.44.4.3 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.57 -r1.57.6.1 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.92.8.1 src/sys/arch/i386/i386/autoconf.c:1.92.8.2
--- src/sys/arch/i386/i386/autoconf.c:1.92.8.1 Mon Nov 17 18:53:54 2008
+++ src/sys/arch/i386/i386/autoconf.c Sun Nov 21 02:46:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.92.8.1 2008/11/17 18:53:54 snj Exp $ */
+/* $NetBSD: autoconf.c,v 1.92.8.2 2010/11/21 02:46:24 riz 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.92.8.1 2008/11/17 18:53:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.92.8.2 2010/11/21 02:46:24 riz 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.44.4.2 src/sys/arch/x86/conf/files.x86:1.44.4.3
--- src/sys/arch/x86/conf/files.x86:1.44.4.2 Mon Oct 5 11:37:14 2009
+++ src/sys/arch/x86/conf/files.x86 Sun Nov 21 02:46:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.44.4.2 2009/10/05 11:37:14 sborrill Exp $
+# $NetBSD: files.x86,v 1.44.4.3 2010/11/21 02:46:23 riz 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.57 src/sys/arch/x86/x86/intr.c:1.57.6.1
--- src/sys/arch/x86/x86/intr.c:1.57 Thu Jul 3 15:44:19 2008
+++ src/sys/arch/x86/x86/intr.c Sun Nov 21 02:46:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.57 2008/07/03 15:44:19 drochner Exp $ */
+/* $NetBSD: intr.c,v 1.57.6.1 2010/11/21 02:46:24 riz 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.57 2008/07/03 15:44:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.57.6.1 2010/11/21 02:46:24 riz Exp $");
+#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
#include "opt_acpi.h"
