Attachment 177427 Details for Bug 214865 – patch

[patch] patch

cpuid.patch (text/plain), 2.57 KB, created by Piotr Kubaj on 2016-11-27 00:33:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-11-27 00:33:10 UTC

Size: 2.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 427184)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cpuid
>-PORTVERSION=	20160814
>+PORTVERSION=	20161114
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.etallen.com/cpuid/
> PKGNAMESUFFIX=	${CPUID_SUFFIX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 427184)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1476108297
>-SHA256 (cpuid-20160814.src.tar.gz) = fd4e2b2d88f417ae32f47a92d29351de395a36578fde8aedc228e2e131f38ecd
>-SIZE (cpuid-20160814.src.tar.gz) = 77160
>+TIMESTAMP = 1480199308
>+SHA256 (cpuid-20161114.src.tar.gz) = 19564f068d0bc1a30d033476da89a9f348fd94b6dbfeae22dab7974514ffc3aa
>+SIZE (cpuid-20161114.src.tar.gz) = 78758
>Index: files/patch-cpuid.c
>===================================================================
>--- files/patch-cpuid.c	(revision 427184)
>+++ files/patch-cpuid.c	(working copy)
>@@ -1,4 +1,4 @@
>---- cpuid.c.orig	2016-08-15 03:54:53 UTC
>+--- cpuid.c.orig	2016-11-14 01:57:53 UTC
> +++ cpuid.c
> @@ -23,6 +23,8 @@
>  #define USE_KERNEL_SCHED_SETAFFINITY
>@@ -18,7 +18,7 @@
>  
>  #ifdef USE_CPUID_MODULE
>  #include <linux/major.h>
>-@@ -6420,11 +6424,16 @@ real_setup(unsigned int  cpu,
>+@@ -6471,11 +6475,16 @@ real_setup(unsigned int  cpu,
>           int  status;
>           status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
>  #else
>@@ -37,7 +37,7 @@
>  #endif
>           if (status == -1) {
>              if (cpu > 0) {
>-@@ -6539,11 +6548,14 @@ static int real_get (int           cpuid
>+@@ -6590,11 +6599,14 @@ static int real_get (int           cpuid
>            : "a" (reg), 
>              "c" (ecx));
>     } else {
>@@ -55,17 +55,16 @@
>        if (result == -1) {
>           if (quiet) {
>              return FALSE;
>-@@ -7050,7 +7062,8 @@ main(int     argc,
>+@@ -7134,7 +7146,7 @@ main(int     argc,
>     };
>  
>-    boolean  opt_one_cpu  = FALSE;
>--   boolean  opt_inst     = FALSE;
>-+   //boolean  opt_inst     = FALSE;
>-+   boolean  opt_inst     = TRUE;
>-    boolean  opt_kernel   = FALSE;
>-    boolean  opt_raw      = FALSE;
>-    boolean  opt_debug    = FALSE;
>-@@ -7134,7 +7147,8 @@ 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,
>     }
>  
>     // Default to -i.  So use inst unless -k is specified.

Flags:

pkubaj: maintainer-approval+

Actions: View | Diff

Attachments on bug 214865: 177427