1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- rdmsr.c.orig 2007-11-27 03:37:20.000000000 +0300
+++ rdmsr.c 2008-08-09 23:03:05.000000000 +0400
@@ -17,8 +17,15 @@
#include "x86info.h"
#if defined(__FreeBSD__)
-# include <sys/ioctl.h>
-# include <cpu.h>
+# include <sys/param.h>
+# include <sys/ioctl.h>
+# if __FreeBSD_version < 800042
+# define CPUDEV "/dev/cpu%d"
+# include <cpu.h>
+# else
+# define CPUDEV "/dev/cpuctl%d"
+# include <sys/cpuctl.h>
+# endif
#endif
#if defined(__FreeBSD__)
@@ -30,12 +37,16 @@
unsigned long lo, hi;
int fh;
static int nodriver=0;
+#if __FreeBSD_version < 800042
cpu_msr_args_t args;
+#else
+ cpuctl_msr_args_t args;
+#endif
if (nodriver==1)
return 0;
- (void)snprintf(cpuname, sizeof(cpuname), "/dev/cpu%d", cpu);
+ (void)snprintf(cpuname, sizeof(cpuname), CPUDEV, cpu);
fh = open(cpuname, O_RDONLY);
if (fh==-1) {
@@ -46,7 +57,11 @@
}
args.msr = idx;
+#if __FreeBSD_version < 800042
if (ioctl(fh, CPU_RDMSR, &args) != 0) {
+#else
+ if (ioctl(fh, CPUCTL_RDMSR, &args) != 0) {
+#endif
if (close(fh) == -1) {
perror("close");
exit(EXIT_FAILURE);
|
