linux-3.5: fix perf build with a patch from the perf mailing list

This commit is contained in:
Lluís Batlle i Rossell 2012-08-10 09:41:43 +02:00
parent 186601f461
commit 734bb84f09
3 changed files with 23 additions and 0 deletions

View file

@ -226,6 +226,11 @@ rec {
patch = ./dell-rfkill.patch;
};
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;
};
sheevaplug_modules_2_6_35 =
{ name = "sheevaplug_modules-2.6.35";
patch = ./sheevaplug_modules-2.6.35.patch;

View file

@ -0,0 +1,17 @@
http://permalink.gmane.org/gmane.linux.kernel.perf.user/960
Fix to build perf.
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 9f6cebd..d5491f1 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -15,7 +15,7 @@
#include "cpumap.h"
#include "thread_map.h"
#include "target.h"
-#include "../../include/linux/perf_event.h"
+#include "../../../include/linux/perf_event.h"
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
#define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))

View file

@ -5757,6 +5757,7 @@ let
[
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_5
kernelPatches.perf3_5
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill