From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 12:21:51 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06A1916A4C1; Tue, 30 Sep 2003 12:21:51 -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 B608316A4BF
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 12:21:50 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA6A743F85
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 12:21:49 -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 h8UJLnXJ011861
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 12:21:49 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UJLnaI011858
	for perforce@freebsd.org; Tue, 30 Sep 2003 12:21:49 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Sep 2003 12:21:49 -0700 (PDT)
Message-Id: <200309301921.h8UJLnaI011858@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 38903 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 19:21:51 -0000

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

Change 38903 by peter@peter_daintree on 2003/09/30 12:21:16

	import jhb's cleanups

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#9 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ====

@@ -78,12 +78,8 @@
 	int error, vector;
 
 	vector = isrc->is_pic->pic_vector(isrc);
-	mtx_lock_spin(&intr_table_lock);
-	if (interrupt_sources[vector] != NULL) {
-		mtx_unlock_spin(&intr_table_lock);
+	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
-	}
-	mtx_unlock_spin(&intr_table_lock);
 	/*
 	 * Ok, so this is kind of a nasty optimization that only works
 	 * because sizeof(int) == sizeof(void *) on i386.  If we passed
@@ -103,7 +99,6 @@
 		return (error);
 	mtx_lock_spin(&intr_table_lock);
 	if (interrupt_sources[vector] != NULL) {
-		/* XXX: This should never happen. */
 		mtx_unlock_spin(&intr_table_lock);
 		ithread_destroy(isrc->is_ithread);
 		return (EEXIST);
@@ -117,12 +112,8 @@
 struct intsrc *
 intr_lookup_source(int vector)
 {
-	struct intsrc *isrc;
 
-	mtx_lock_spin(&intr_table_lock);
-	isrc = interrupt_sources[vector];
-	mtx_unlock_spin(&intr_table_lock);
-	return (isrc);
+	return (interrupt_sources[vector]);
 }
 
 int

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

@@ -38,23 +38,14 @@
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#if 0
-#include <sys/proc.h>
-#endif
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/apicreg.h>
-#if 0
-#include <machine/cpufunc.h>
-#endif
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
-#if 0
-#include <machine/smp.h>
-#endif
 #include <machine/segments.h>
 
 #ifdef DEV_ISA

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

@@ -35,29 +35,17 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/pcpu.h>
-#if 0
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#endif
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/apicreg.h>
-#if 0
-#include <machine/cpufunc.h>
-#endif
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
-#if 0
-#include <machine/mpapic.h>
-#include <machine/segments.h>
-#endif
 #include <machine/specialreg.h>
 
 /*