diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/lttng-modules-remove-kernel-version-check.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/lttng-modules-remove-kernel-version-check.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-remove-kernel-version-check.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-remove-kernel-version-check.patch new file mode 100644 index 0000000000..02d8d8827e --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-remove-kernel-version-check.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | This is required in order the make the build succeed for | ||
2 | machine k2hk-evm, image enea-image-demo. | ||
3 | |||
4 | The patch for commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f is already part of the build. | ||
5 | It is located here: | ||
6 | poky/meta-ti/recipes-kernel/linux/linux-keystone-3.10.10/Fix_HRTICK_related_deadlock_from_ntp_lock.patch | ||
7 | and it is applied for kernel recipe poky/meta-ti/recipes-kernel/linux/linux-keystone_3.10.bb, | ||
8 | that is the kernel used for k2hk-evm. | ||
9 | |||
10 | In this regard, I removed the check until TI upgrade their | ||
11 | kernels to a supported version. | ||
12 | |||
13 | Upstream-Status: Not Applicable | ||
14 | |||
15 | Signed-off-by: Liviu Gheorghisan <liviu.gheorghisan@enea.com> | ||
16 | |||
17 | --- | ||
18 | --- a/wrapper/trace-clock.h 2014-07-25 15:54:00.677739746 +0200 | ||
19 | +++ b/wrapper/trace-clock.h 2014-07-25 15:55:49.807390266 +0200 | ||
20 | @@ -36,10 +36,6 @@ | ||
21 | #include "../lttng-kernel-version.h" | ||
22 | #include "random.h" | ||
23 | |||
24 | -#if LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3) | ||
25 | -#error "Linux kernels 3.10 and 3.11 introduce a deadlock in the timekeeping subsystem. Fixed by commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f \"timekeeping: Fix HRTICK related deadlock from ntp lock changes\" in Linux." | ||
26 | -#endif | ||
27 | - | ||
28 | static inline u64 trace_clock_monotonic_wrapper(void) | ||
29 | { | ||
30 | ktime_t ktime; | ||