From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 15:39:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 72D1416A4D0; Thu, 30 Oct 2003 15:39:48 -0800 (PST)
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 36CC116A4CE
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:39:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9AD4743F75
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:39:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNdlXJ086225
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:39:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNdkqs086222
	for perforce@freebsd.org; Thu, 30 Oct 2003 15:39:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Oct 2003 15:39:47 -0800 (PST)
Message-Id: <200310302339.h9UNdkqs086222@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40895 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: Thu, 30 Oct 2003 23:39:48 -0000

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

Change 40895 by peter@peter_daintree on 2003/10/30 15:38:50

	fix merge conflict

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/apicvar.h#7 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#7 (text+ko) ====

@@ -162,7 +162,6 @@
 int	lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi);
 int	lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger);
 void	lapic_setup(void);
-void	lapic_disable(void);
 
 #endif /* !LOCORE */
 #endif /* _MACHINE_APICVAR_H_ */