From owner-p4-projects@FreeBSD.ORG  Sun Jul  4 06:17:31 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA84C16A4D0; Sun,  4 Jul 2004 06:17:31 +0000 (GMT)
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 85A8716A4CE
	for <perforce@freebsd.org>; Sun,  4 Jul 2004 06:17:31 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7E93443D53
	for <perforce@freebsd.org>; Sun,  4 Jul 2004 06:17:31 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i646HVpf031330
	for <perforce@freebsd.org>; Sun, 4 Jul 2004 06:17:31 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i646HVwP031327
	for perforce@freebsd.org; Sun, 4 Jul 2004 06:17:31 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 4 Jul 2004 06:17:31 GMT
Message-Id: <200407040617.i646HVwP031327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 56407 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jul 2004 06:17:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=56407

Change 56407 by marcel@marcel_nfs on 2004/07/04 06:17:20

	IFC @56405

Affected files ...

.. //depot/projects/gdb/sys/kern/kern_switch.c#5 integrate

Differences ...

==== //depot/projects/gdb/sys/kern/kern_switch.c#5 (text+ko) ====

@@ -86,7 +86,7 @@
 ***/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.68 2004/07/02 20:21:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.69 2004/07/03 00:57:43 marcel Exp $");
 
 #include "opt_full_preemption.h"
 
@@ -474,8 +474,10 @@
 int
 maybe_preempt(struct thread *td)
 {
+#ifdef PREEMPTION
 	struct thread *ctd;
 	int cpri, pri;
+#endif
 
 	mtx_assert(&sched_lock, MA_OWNED);
 #ifdef PREEMPTION