Date: Tue, 15 Mar 2011 21:45:10 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219679 - head/sys/i386/include Message-ID: <201103152145.p2FLjAlt060256@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Mar 15 21:45:10 2011 New Revision: 219679 URL: http://svn.freebsd.org/changeset/base/219679 Log: Partially revert r219672. After r198295, kernel need to seed randomness as soon as possible for stack protector. However, dummy timecounter does not have enough entropy and we don't need to sacrifice Pentium class and later. Pointed out by: Maxim Dounin (mdounin at mdounin dot ru) Modified: head/sys/i386/include/cpu.h Modified: head/sys/i386/include/cpu.h ============================================================================== --- head/sys/i386/include/cpu.h Tue Mar 15 21:34:10 2011 (r219678) +++ head/sys/i386/include/cpu.h Tue Mar 15 21:45:10 2011 (r219679) @@ -69,10 +69,14 @@ void swi_vm(void *); static __inline uint64_t get_cyclecount(void) { +#if defined(I486_CPU) || defined(KLD_MODULE) struct bintime bt; binuptime(&bt); return ((uint64_t)bt.sec << 56 | bt.frac >> 8); +#else + return (rdtsc()); +#endif } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103152145.p2FLjAlt060256>