- up to 4.9.0

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 49f8e410de8d5594b811232058cfef442d4bc1a5..4566867b6842b6e371caaca0867241d2930e466c 100644 (file)
--- 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 394a046795526b3b00f1345087457902c632dd3f..13017ff66e8df784dfb3ef0d9768075fe463216a 100644 (file)
--- 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;