- -cpupower-libs-devel doesn't require base

[packages/kernel-tools.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 5c0625480f40f40f33aaa4c521ed763b342908da..aecbedc36d6fcf0dd0616cd7ca1ac32f41b881dd 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -52,17 +52,6 @@
        movl %eax, DI(%edi)
        movl %ebp, BP(%edi)
  
---- linux-3.19/arch/x86/include/uapi/asm/bitsperlong.h~        2015-02-09 03:54:22.000000000 +0100
-+++ linux-3.19/arch/x86/include/uapi/asm/bitsperlong.h 2015-04-11 12:31:26.051249909 +0200
-@@ -1,7 +1,7 @@
- #ifndef __ASM_X86_BITSPERLONG_H
- #define __ASM_X86_BITSPERLONG_H
- 
--#ifdef __x86_64__
-+#if defined(__x86_64__) && !defined(__ILP32__)
- # define __BITS_PER_LONG 64
- #else
- # define __BITS_PER_LONG 32
 --- linux-3.19/tools/perf/bench/sched-messaging.c~     2015-02-09 03:54:22.000000000 +0100
 +++ linux-3.19/tools/perf/bench/sched-messaging.c      2015-04-11 12:33:22.587917365 +0200
 @@ -310,13 +310,24 @@
@@ -127,13 +116,13 @@
 --- linux-3.19/tools/perf/builtin-stat.c~      2015-02-09 03:54:22.000000000 +0100
 +++ linux-3.19/tools/perf/builtin-stat.c       2015-04-11 12:35:21.841251509 +0200
 @@ -550,7 +550,11 @@
+ {
+       static int num_print_interval;
  
-       clock_gettime(CLOCK_MONOTONIC, &ts);
-       diff_timespec(&rs, &ts, &ref_time);
 +#if defined(__x86_64__) && !defined(__ILP32__)
-       sprintf(prefix, "%6lu.%09lu%s", rs.tv_sec, rs.tv_nsec, csv_sep);
+       sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep);
 +#else
-+      sprintf(prefix, "%6llu.%09llu%s", rs.tv_sec, rs.tv_nsec, csv_sep);
++      sprintf(prefix, "%6llu.%09llu%s", ts->tv_sec, ts->tv_nsec, csv_sep);
 +#endif
  
        if (num_print_interval == 0 && !csv_output) {