Fix compilation error with 3.0.

  Avoid warning like error: __attribute_const__ redefined.
  Include sys/resource.h for rusage definition
  Change BuildRequires: elfutils-libelf-devel --> libelf-devel

diff --git a/packaging/kernel-mfld-blackbay.spec b/packaging/kernel-mfld-blackbay.spec
index ebbea58..c840de2 100644 (file)
--- a/packaging/kernel-mfld-blackbay.spec
+++ b/packaging/kernel-mfld-blackbay.spec
@@ -17,7 +17,7 @@ Version: %{upstream_version}
 Release: 1
 BuildRequires: module-init-tools
 BuildRequires: findutils
-BuildRequires: elfutils-libelf-devel
+BuildRequires: libelf-devel
 BuildRequires: binutils-devel
 BuildRequires: which
 BuildRequires: libnl2-devel

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index dcfe887..3632c2f 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -14,6 +14,7 @@
 #include "util/debug.h"
 
 #include <sys/prctl.h>
+#include <sys/resource.h>
 
 #include <semaphore.h>
 #include <pthread.h>

diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
index 791f9dd..426a8ca 100644 (file)
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -4,9 +4,12 @@
 #ifndef __always_inline
 #define __always_inline        inline
 #endif
+#undef __user
 #define __user
+#undef __attribute_const__
 #define __attribute_const__
 
+#undef __used
 #define __used         __attribute__((__unused__))
 
 #endif