From owner-p4-projects@FreeBSD.ORG Tue Jun 28 20:17:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7466316A420; Tue, 28 Jun 2005 20:17:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 477E116A41C for ; Tue, 28 Jun 2005 20:17:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 187A743D53 for ; Tue, 28 Jun 2005 20:17:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5SKHnxu000686 for ; Tue, 28 Jun 2005 20:17:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SKHnLc000683 for perforce@freebsd.org; Tue, 28 Jun 2005 20:17:49 GMT (envelope-from peter@freebsd.org) Date: Tue, 28 Jun 2005 20:17:49 GMT Message-Id: <200506282017.j5SKHnLc000683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 79106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jun 2005 20:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=79106 Change 79106 by peter@peter_daintree on 2005/06/28 20:17:41 aargh, there is no reason to have KDB_STOP_NMI in opt_global.h Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#99 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#67 edit .. //depot/projects/hammer/sys/conf/options.amd64#36 edit .. //depot/projects/hammer/sys/conf/options.i386#37 edit .. //depot/projects/hammer/sys/conf/options.pc98#33 edit .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#46 edit .. //depot/projects/hammer/sys/i386/i386/trap.c#36 edit .. //depot/projects/hammer/sys/kern/subr_kdb.c#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#99 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.259 2005/06/09 18:23:54 ups Exp $"); #include "opt_cpu.h" +#include "opt_kdb.h" #include "opt_kstack_pages.h" #include "opt_mp_watchdog.h" #include "opt_sched.h" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#67 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_cpu.h" #include "opt_hwpmc_hooks.h" #include "opt_isa.h" +#include "opt_kdb.h" #include "opt_ktrace.h" #include ==== //depot/projects/hammer/sys/conf/options.amd64#36 (text+ko) ==== @@ -57,4 +57,4 @@ DEV_ATPIC opt_atpic.h # Debugging -KDB_STOP_NMI opt_global.h +KDB_STOP_NMI opt_kdb.h ==== //depot/projects/hammer/sys/conf/options.i386#37 (text+ko) ==== @@ -162,5 +162,5 @@ ASR_COMPAT opt_asr.h # Debugging -KDB_STOP_NMI opt_global.h +KDB_STOP_NMI opt_kdb.h NPX_DEBUG opt_npx.h ==== //depot/projects/hammer/sys/conf/options.pc98#33 (text+ko) ==== @@ -104,5 +104,5 @@ DEV_NPX opt_npx.h # Debugging -KDB_STOP_NMI opt_global.h +KDB_STOP_NMI opt_kdb.h NPX_DEBUG opt_npx.h ==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#46 (text+ko) ==== @@ -28,6 +28,7 @@ #include "opt_apic.h" #include "opt_cpu.h" +#include "opt_kdb.h" #include "opt_kstack_pages.h" #include "opt_mp_watchdog.h" #include "opt_sched.h" ==== //depot/projects/hammer/sys/i386/i386/trap.c#36 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_cpu.h" #include "opt_hwpmc_hooks.h" #include "opt_isa.h" +#include "opt_kdb.h" #include "opt_ktrace.h" #include "opt_npx.h" #include "opt_trap.h" ==== //depot/projects/hammer/sys/kern/subr_kdb.c#11 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.11 2005/04/30 20:00:59 dwhite Exp $"); +#include "opt_kdb.h" + #include #include #include