Attachment #177427 for bug #214865

View | Details | Raw Unified | Return to bug 214865
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cpuid	4	PORTNAME= cpuid
5	PORTVERSION= 20160814	5	PORTVERSION= 20161114
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= http://www.etallen.com/cpuid/	7	MASTER_SITES= http://www.etallen.com/cpuid/
8	PKGNAMESUFFIX= ${CPUID_SUFFIX}	8	PKGNAMESUFFIX= ${CPUID_SUFFIX}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1476108297	1	TIMESTAMP = 1480199308
2	SHA256 (cpuid-20160814.src.tar.gz) = fd4e2b2d88f417ae32f47a92d29351de395a36578fde8aedc228e2e131f38ecd	2	SHA256 (cpuid-20161114.src.tar.gz) = 19564f068d0bc1a30d033476da89a9f348fd94b6dbfeae22dab7974514ffc3aa
3	SIZE (cpuid-20160814.src.tar.gz) = 77160	3	SIZE (cpuid-20161114.src.tar.gz) = 78758




--- cpuid.c.orig	2016-11-14 01:57:53 UTC
+++ cpuid.c
@@ -23,6 +23,8 @@
 #define USE_KERNEL_SCHED_SETAFFINITY

 
 #ifdef USE_CPUID_MODULE
 #include <linux/major.h>
@@ -6471,11 +6475,16 @@ real_setup(unsigned int  cpu,
          int  status;
          status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
 #else

 #endif
          if (status == -1) {
             if (cpu > 0) {
@@ -6590,11 +6599,14 @@ static int real_get (int           cpuid
           : "a" (reg), 
             "c" (ecx));
    } else {

       if (result == -1) {
          if (quiet) {
             return FALSE;
@@ -7134,7 +7146,7 @@ main(int     argc,
    };
 
    boolean        opt_one_cpu     = FALSE;
-   boolean        opt_inst        = FALSE;
+   boolean        opt_inst        = TRUE;
    boolean        opt_kernel      = FALSE;
    boolean        opt_raw         = FALSE;
    boolean        opt_debug       = FALSE;
@@ -7264,7 +7276,8 @@ main(int     argc,
@@ -7134,7 +7147,8 @@ main(int     argc,
    }
 
    // Default to -i.  So use inst unless -k is specified.

Return to bug 214865

Lines 1-4 Link Here

(-)files/patch-cpuid.c (-12 / +11 lines)
1	--- cpuid.c.orig 2016-08-15 03:54:53 UTC	1	--- cpuid.c.orig 2016-11-14 01:57:53 UTC
2	+++ cpuid.c	2	+++ cpuid.c
3	@@ -23,6 +23,8 @@	3	@@ -23,6 +23,8 @@
4	#define USE_KERNEL_SCHED_SETAFFINITY	4	#define USE_KERNEL_SCHED_SETAFFINITY
Lines 18-24 Link Here
18		18
19	#ifdef USE_CPUID_MODULE	19	#ifdef USE_CPUID_MODULE
20	#include <linux/major.h>	20	#include <linux/major.h>
21	@@ -6420,11 +6424,16 @@ real_setup(unsigned int cpu,	21	@@ -6471,11 +6475,16 @@ real_setup(unsigned int cpu,
22	int status;	22	int status;
23	status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);	23	status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
24	#else	24	#else
Lines 37-43 Link Here
37	#endif	37	#endif
38	if (status == -1) {	38	if (status == -1) {
39	if (cpu > 0) {	39	if (cpu > 0) {
40	@@ -6539,11 +6548,14 @@ static int real_get (int cpuid	40	@@ -6590,11 +6599,14 @@ static int real_get (int cpuid
41	: "a" (reg),	41	: "a" (reg),
42	"c" (ecx));	42	"c" (ecx));
43	} else {	43	} else {
Lines 55-71 Link Here
55	if (result == -1) {	55	if (result == -1) {
56	if (quiet) {	56	if (quiet) {
57	return FALSE;	57	return FALSE;
58	@@ -7050,7 +7062,8 @@ main(int argc,	58	@@ -7134,7 +7146,7 @@ main(int argc,
59	};	59	};
60		60
61	boolean opt_one_cpu = FALSE;	61	boolean opt_one_cpu = FALSE;
62	- boolean opt_inst = FALSE;	62	- boolean opt_inst = FALSE;
63	+ //boolean opt_inst = FALSE;	63	+ boolean opt_inst = TRUE;
64	+ boolean opt_inst = TRUE;	64	boolean opt_kernel = FALSE;
65	boolean opt_kernel = FALSE;	65	boolean opt_raw = FALSE;
66	boolean opt_raw = FALSE;	66	boolean opt_debug = FALSE;
67	boolean opt_debug = FALSE;	67	@@ -7264,7 +7276,8 @@ main(int argc,
68	@@ -7134,7 +7147,8 @@ main(int argc,
69	}	68	}
70		69
71	// Default to -i. So use inst unless -k is specified.	70	// Default to -i. So use inst unless -k is specified.