1 files changed, 0 insertions, 54 deletions
diff --git a/sysutils/x86info/files/patch-rdmsr.c b/sysutils/x86info/files/patch-rdmsr.c
deleted file mode 100644
index ba7b187b9648..000000000000
--- a/sysutils/x86info/files/patch-rdmsr.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- rdmsr.c.orig	2011-09-15 15:39:28.000000000 -0700
-+++ rdmsr.c	2011-09-15 15:39:37.000000000 -0700
-@@ -18,8 +18,15 @@
- #include "x86info.h"
- 
- #if defined(__FreeBSD__)
-+# include <sys/param.h>
- # include <sys/ioctl.h>
--# include <cpu.h>
-+# if __FreeBSD_version < 701102
-+#  define CPUDEV "/dev/cpu%d"
-+#  include <cpu.h>
-+# else
-+#  define CPUDEV "/dev/cpuctl%d"
-+#  include <sys/cpuctl.h>
-+# endif
- #endif
- 
- #if defined(__FreeBSD__)
-@@ -27,16 +34,18 @@
- int read_msr(int cpu, unsigned int idx, unsigned long long *val)
- {
- 	char cpuname[16];
--	unsigned char buffer[8];
--	unsigned long lo, hi;
- 	int fh;
- 	static int nodriver=0;
-+#if __FreeBSD_version < 701102
- 	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 +55,11 @@
- 	}
- 
- 	args.msr = idx;
--	if (ioctl(fh, CPU_RDMSR, &args) != 0) {
-+#if __FreeBSD_version < 701102
-+	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);