From owner-p4-projects@FreeBSD.ORG  Sun May 16 15:29:04 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BFDC16A4D0; Sun, 16 May 2004 15:29:04 -0700 (PDT)
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 2718E16A4CE
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:29:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D73ED43D41
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:29:03 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4GMT3Ge033113
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:29:03 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GMT3kt033110
	for perforce@freebsd.org; Sun, 16 May 2004 15:29:03 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sun, 16 May 2004 15:29:03 -0700 (PDT)
Message-Id: <200405162229.i4GMT3kt033110@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 52890 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, 16 May 2004 22:29:04 -0000

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

Change 52890 by peter@peter_overcee on 2004/05/16 15:28:38

	kill my fast KTR_CPU hack, I don't need it anymore.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#37 edit
.. //depot/projects/hammer/sys/kern/kern_ktr.c#9 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#37 (text+ko) ====

@@ -304,12 +304,7 @@
 lapic_id(void)
 {
 
-#if 0
 	KASSERT(lapic != NULL, ("local APIC is not mapped"));
-#else
-	if (lapic == 0)
-		return 0;
-#endif
 	return (lapic->id >> APIC_ID_SHIFT);
 }
 

==== //depot/projects/hammer/sys/kern/kern_ktr.c#9 (text+ko) ====

@@ -55,13 +55,6 @@
 #include <machine/ktr.h>
 #endif
 
-#ifdef __amd64__
-#include <sys/bus.h>
-#include <machine/intr_machdep.h>
-#include <machine/apicvar.h>
-#define  KTR_CPU lapic_id()
-#endif
-
 #include <ddb/ddb.h>
 
 #ifndef KTR_ENTRIES