From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 18:20:14 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B004F16A4C0; Mon, 29 Sep 2003 18:20:13 -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 80B0716A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:20:13 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 059F84400B
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:20:13 -0700 (PDT)
	(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 h8U1KCXJ026864
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:20:12 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1KCW9026861
	for perforce@freebsd.org; Mon, 29 Sep 2003 18:20:12 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Sep 2003 18:20:12 -0700 (PDT)
Message-Id: <200309300120.h8U1KCW9026861@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 38824 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: Tue, 30 Sep 2003 01:20:14 -0000

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

Change 38824 by peter@peter_hammer on 2003/09/29 18:19:48

	fix another setidt() botch
	fix a jhb-typo
	finish removing 686 workaround

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#7 edit

Differences ...

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

@@ -242,7 +242,7 @@
 	KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry"));
 	KASSERT(ioint_handlers[vector / 32] != NULL,
 	    ("No ISR handler for IRQ %d", IDT_TO_IRQ(vector)));
-	setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL,SEL_KPL,  0);
+	setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL,  0);
 }
 
 void
@@ -376,9 +376,9 @@
 		lv->lvt_edgetrigger = 1;
 		lv->lvt_activehi = 1;
 		if (mode == APIC_LVT_DM_EXTINT)
-			lvt->lvt_masked = 1;
+			lv->lvt_masked = 1;
 		else
-			lvt->lvt_masked = 0;
+			lv->lvt_masked = 0;
 		break;
 	default:
 		panic("Unsupported delivery mode: 0x%x\n", mode);
@@ -513,7 +513,6 @@
 apic_setup_local(void *dummy __unused)
 {
 	int retval;
-	uint64_t apic_base;
 
 	if (best_enum == NULL)
 		return;