[packages/kernel-tools] - up to 4.9.0

[baggins]

commit 2c8f0d44e701092a18ade61ff0c853e0d72f3569
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 17 13:00:10 2016 +0100

    - up to 4.9.0

 kernel-tools.spec | 14 ++++++++------
 x32.patch         | 16 ++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 49f8e41..4566867 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -20,17 +20,17 @@
 %undefine	with_multilib
 %endif
 
-%define		basever		4.8
-%define		postver		.1
+%define		basever		4.9
+%define		postver		.0
 Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
 Version:	%{basever}%{postver}
-Release:	4
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	c1af0afbd3df35c1ccdc7a5118cd2d07
+# Source0-md5:	0a68ef3615c64bd5ee54a3320e46667d
 Source1:	cpupower.service
 Source2:	cpupower.config
 %if "%{postver}" != ".0"
@@ -365,7 +365,9 @@ cd linux-%{basever}
 cd linux-%{basever}
 
 # Simple Disk Sleep Monitor
-%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags} Documentation/laptops/dslm.c -o dslm
+%{__make} -C tools/laptop/dslm \
+	%{makeopts} \
+	EXTRA_CFLAGS="%{rpmcflags}"
 
 # tools common (used eg. by tools/vm)
 %{__make} -C tools/lib/api \
@@ -540,7 +542,7 @@ install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8}
 
-install -p dslm $RPM_BUILD_ROOT%{_sbindir}
+install -p tools/laptop/dslm/dslm $RPM_BUILD_ROOT%{_sbindir}
 
 install -p tools/gpio/lsgpio $RPM_BUILD_ROOT%{_bindir}
 
diff --git a/x32.patch b/x32.patch
index 394a046..13017ff 100644
--- a/x32.patch
+++ b/x32.patch
@@ -62,20 +62,20 @@ FIXME: regs_load.S need complete x32 ABI support; now it will just compile, but
 +#if defined(__x86_64__) && !defined(__ILP32__)
  		printf(" %14s: %lu.%03lu [sec]\n", "Total time",
  		       diff.tv_sec,
- 		       (unsigned long) (diff.tv_usec/1000));
+ 		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
 +#else
 +		printf(" %14s: %llu.%03llu [sec]\n", "Total time",
 +		       diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec/1000));
++		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
 +#endif
  		break;
  	case BENCH_FORMAT_SIMPLE:
 +#if defined(__x86_64__) && !defined(__ILP32__)
  		printf("%lu.%03lu\n", diff.tv_sec,
- 		       (unsigned long) (diff.tv_usec/1000));
+ 		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
 +#else
 +		printf("%llu.%03llu\n", diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec/1000));
++		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
 +#endif
  		break;
  	default:
@@ -89,11 +89,11 @@ FIXME: regs_load.S need complete x32 ABI support; now it will just compile, but
 +#if defined(__x86_64__) && !defined(__ILP32__)
  		printf(" %14s: %lu.%03lu [sec]\n\n", "Total time",
  		       diff.tv_sec,
- 		       (unsigned long) (diff.tv_usec/1000));
+ 		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
 +#else
 +		printf(" %14s: %llu.%03llu [sec]\n\n", "Total time",
 +		       diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec/1000));
++		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
 +#endif
  
  		printf(" %14lf usecs/op\n",
@@ -105,11 +105,11 @@ FIXME: regs_load.S need complete x32 ABI support; now it will just compile, but
 +#if defined(__x86_64__) && !defined(__ILP32__)
  		printf("%lu.%03lu\n",
  		       diff.tv_sec,
- 		       (unsigned long) (diff.tv_usec / 1000));
+ 		       (unsigned long) (diff.tv_usec / USEC_PER_MSEC));
 +#else
 +		printf("%llu.%03llu\n",
 +		       diff.tv_sec,
-+		       (unsigned long long) (diff.tv_usec / 1000));
++		       (unsigned long long) (diff.tv_usec / USEC_PER_MSEC));
 +#endif
  		break;
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/2c8f0d44e701092a18ade61ff0c853e0d72f3569