From owner-svn-src-user@FreeBSD.ORG  Fri Apr 13 14:36:58 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 64B05106564A;
	Fri, 13 Apr 2012 14:36:58 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FB748FC14;
	Fri, 13 Apr 2012 14:36:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DEaw0P083689;
	Fri, 13 Apr 2012 14:36:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DEawlP083687;
	Fri, 13 Apr 2012 14:36:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204131436.q3DEawlP083687@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 13 Apr 2012 14:36:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234224 - user/ed/newcons/sys/sparc64/sparc64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 14:36:58 -0000

Author: nwhitehorn
Date: Fri Apr 13 14:36:57 2012
New Revision: 234224
URL: http://svn.freebsd.org/changeset/base/234224

Log:
  Fix mismerge in r234200.

Modified:
  user/ed/newcons/sys/sparc64/sparc64/machdep.c

Modified: user/ed/newcons/sys/sparc64/sparc64/machdep.c
==============================================================================
--- user/ed/newcons/sys/sparc64/sparc64/machdep.c	Fri Apr 13 12:53:56 2012	(r234223)
+++ user/ed/newcons/sys/sparc64/sparc64/machdep.c	Fri Apr 13 14:36:57 2012	(r234224)
@@ -556,11 +556,6 @@ sparc64_init(caddr_t mdp, u_long o1, u_l
 	sun4u_set_traptable(tl0_base);
 
 	/*
-	 * It's now safe to use the real DELAY().
-	 */
-	delay_func = delay_tick;
-
-	/*
 	 * Initialize the dynamic per-CPU area for the BSP and the message
 	 * buffer (after setting the trap table).
 	 */