diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-10 09:41:43 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-10 09:41:43 +0200 |
| commit | 734bb84f09f8e3dee4bd38dcbe0931a7e2064502 (patch) | |
| tree | ebc03b2b4037d10eac7d500416d55d348d660e9b /pkgs/os-specific | |
| parent | 186601f461d5b4818936af8ba43ca3cef7614968 (diff) | |
linux-3.5: fix perf build with a patch from the perf mailing list
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf-3.5.patch | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a8c03d0ffb121..e9cd15bb31ce1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -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; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch new file mode 100644 index 0000000000000..6d62a1db80e76 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf-3.5.patch @@ -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)) |