From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 05:54:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C98216A468; Fri, 18 Jan 2008 05:54:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C633D16A420
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 05:54:52 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 91EA813C455
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 05:54:52 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0I5squZ050759
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 05:54:52 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0I5sqTP050756
	for perforce@freebsd.org; Fri, 18 Jan 2008 05:54:52 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 18 Jan 2008 05:54:52 GMT
Message-Id: <200801180554.m0I5sqTP050756@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133526 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: Fri, 18 Jan 2008 05:54:53 -0000

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

Change 133526 by imp@imp_paco-paco on 2008/01/18 05:54:14

	Don't include pte.h
	or define machine, since machdep.c defines that.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu-mips2.c#3 edit

Differences ...

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

@@ -45,7 +45,6 @@
 #include <machine/intr_machdep.h>
 #include <machine/locore.h>
 #include <machine/pte.h>
-#include <machine/tlb.h>
 
 /*
  * mips_num_tlb_entries is
@@ -55,11 +54,6 @@
 
 void	mips_get_identity(struct mips_cpuinfo *cpuinfo);
 
-char machine[] = "mips";
-
-SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD,
-        machine, 0, "Machine class");
-
 /*
  * Exception vector table management.
  */