From owner-p4-projects@FreeBSD.ORG  Tue Aug  8 16:06:57 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0FF816A4DE; Tue,  8 Aug 2006 16:06:57 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 9B33A16A4E8
	for <perforce@FreeBSD.org>; Tue,  8 Aug 2006 16:06:57 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3F2F343D73
	for <perforce@FreeBSD.org>; Tue,  8 Aug 2006 16:06:55 +0000 (GMT)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k78G6tOU010503
	for <perforce@FreeBSD.org>; Tue, 8 Aug 2006 16:06:55 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k78G6t4B010500
	for perforce@freebsd.org; Tue, 8 Aug 2006 16:06:55 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 8 Aug 2006 16:06:55 GMT
Message-Id: <200608081606.k78G6t4B010500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103452 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 08 Aug 2006 16:06:58 -0000

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

Change 103452 by gonzo@gonzo_hq on 2006/08/08 16:06:15

	o Disable clock device initialization for cpu device
	    explicitly. Rely on autoconfiguration stuff for that.
	    Generick ticker code is on it's way.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/cpu.c#14 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#14 (text+ko) ====

@@ -287,16 +287,6 @@
 static int
 cpu_probe(device_t dev)
 {
-	device_t clock;
-
-	if (device_get_unit(dev) != 0)
-		panic("can't attach more cpus");
-	device_set_desc(dev, "MIPS32 processor");
-
-	clock = device_add_child(dev, "mips32_clock", device_get_unit(dev));
-	if (clock == NULL)
-		device_printf(dev, "mips32_clock failed to attach");
-
 	return (0);
 }
 
@@ -304,6 +294,9 @@
 cpu_attach(device_t dev)
 {
 	int error;
+#ifdef notyet
+	device_t clock;
+#endif
 
 	cpu_hardirq_rman.rm_start = 0;
 	cpu_hardirq_rman.rm_end = 5;
@@ -324,6 +317,16 @@
 		return (error);
 	}
 
+	if (device_get_unit(dev) != 0)
+		panic("can't attach more cpus");
+	device_set_desc(dev, "MIPS32 processor");
+
+#ifdef notyet
+	clock = device_add_child(dev, "clock", device_get_unit(dev));
+	if (clock == NULL)
+		device_printf(dev, "clock failed to attach");
+#endif
+
 	return (bus_generic_attach(dev));
 }
 
@@ -355,9 +358,7 @@
 
 	intr = rman_get_start(res);
 
-#if 0
 	cpu_establish_hardintr(intr, handler, arg);
-#endif
 	device_printf(child, "established CPU interrupt %d\n", intr);
 	return (0);
 }