Date: Fri, 13 Apr 2012 14:36:58 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r234224 - user/ed/newcons/sys/sparc64/sparc64 Message-ID: <201204131436.q3DEawlP083687@svn.freebsd.org>
index | next in thread | raw e-mail
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). */help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204131436.q3DEawlP083687>