svn commit: r234224 - user/ed/newcons/sys/sparc64/sparc64
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Fri Apr 13 14:36:58 UTC 2012
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).
*/
More information about the svn-src-user
mailing list