Module Name: src Committed By: cegger Date: Wed Nov 24 14:56:18 UTC 2010
Modified Files: src/sys/arch/x86/x86: intr.c Log Message: when DDB is enabled then use 'db_printf' for 'call intr_printconfig' to respect the 25 lines on vga output To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 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/x86/x86/intr.c diff -u src/sys/arch/x86/x86/intr.c:1.68 src/sys/arch/x86/x86/intr.c:1.69 --- src/sys/arch/x86/x86/intr.c:1.68 Thu Jun 17 06:40:28 2010 +++ src/sys/arch/x86/x86/intr.c Wed Nov 24 14:56:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.68 2010/06/17 06:40:28 mrg Exp $ */ +/* $NetBSD: intr.c,v 1.69 2010/11/24 14:56:18 cegger Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -133,7 +133,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.68 2010/06/17 06:40:28 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.69 2010/11/24 14:56:18 cegger Exp $"); #include "opt_intrdebug.h" #include "opt_multiprocessor.h" @@ -176,6 +176,10 @@ #include <dev/pci/ppbreg.h> #endif +#ifdef DDB +#include <ddb/db_output.h> +#endif + struct pic softintr_pic = { .pic_name = "softintr_fakepic", .pic_type = PIC_SOFT, @@ -1057,6 +1061,11 @@ } #if defined(INTRDEBUG) || defined(DDB) + +#ifdef DDB +#define printf db_printf +#endif + void intr_printconfig(void) { @@ -1086,6 +1095,9 @@ } } } +#ifdef DDB +#undef printf +#endif #endif void