diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a8c03d0ffb1..e9cd15bb31c 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 00000000000..6d62a1db80e --- /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)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b576eb3305f..753fb893e09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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