Deleted Added
full compact
cpu.h (133084) cpu.h (137784)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 16 unchanged lines hidden (view full) ---

25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 16 unchanged lines hidden (view full) ---

25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
33 * $FreeBSD: head/sys/i386/include/cpu.h 133084 2004-08-03 18:44:27Z mux $
33 * $FreeBSD: head/sys/i386/include/cpu.h 137784 2004-11-16 20:42:32Z jhb $
34 */
35
36#ifndef _MACHINE_CPU_H_
37#define _MACHINE_CPU_H_
38
39/*
40 * Definitions unique to i386 cpu support.
41 */

--- 52 unchanged lines hidden (view full) ---

94
95/*
96 * Return contents of in-cpu fast counter as a sort of "bogo-time"
97 * for random-harvesting purposes.
98 */
99static __inline u_int64_t
100get_cyclecount(void)
101{
34 */
35
36#ifndef _MACHINE_CPU_H_
37#define _MACHINE_CPU_H_
38
39/*
40 * Definitions unique to i386 cpu support.
41 */

--- 52 unchanged lines hidden (view full) ---

94
95/*
96 * Return contents of in-cpu fast counter as a sort of "bogo-time"
97 * for random-harvesting purposes.
98 */
99static __inline u_int64_t
100get_cyclecount(void)
101{
102#if defined(I386_CPU) || defined(I486_CPU) || defined(KLD_MODULE)
102#if defined(I486_CPU) || defined(KLD_MODULE)
103 struct bintime bt;
104
105 if (!tsc_present) {
106 binuptime(&bt);
107 return (bt.frac ^ bt.sec);
108 }
109#endif
110 return (rdtsc());
111}
112
113#endif
114
115#endif /* !_MACHINE_CPU_H_ */
103 struct bintime bt;
104
105 if (!tsc_present) {
106 binuptime(&bt);
107 return (bt.frac ^ bt.sec);
108 }
109#endif
110 return (rdtsc());
111}
112
113#endif
114
115#endif /* !_MACHINE_CPU_H_ */