summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng-2.0
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-03-19 17:53:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 20:28:45 (GMT)
commitda0719704036b3a1292afeaa976b64e5e7390472 (patch)
tree9427ce703c3a68e026f2348039ae2547f559965a /meta/recipes-kernel/lttng-2.0
parenta9873f12e5ba11e1307440901d07e9642e9f53bf (diff)
downloadpoky-da0719704036b3a1292afeaa976b64e5e7390472.tar.gz
lttng-modules: fix compliation error with 3.2.x -stable kernels
recent -stable kernels have their own fallback definition of is_compat_task #define is_compat_task() (0) To protect against this double definition of is_compat_task we can check to see if it is already defined, and skip the lttng variant. (From OE-Core rev: 53db58982b7af59d75fc11b73475e9d71e6927ac) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng-2.0')
-rw-r--r--meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch41
-rw-r--r--meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb3
2 files changed, 43 insertions, 1 deletions
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
new file mode 100644
index 0000000..0056633
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
@@ -0,0 +1,41 @@
1From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Mon, 19 Mar 2012 13:30:31 -0400
4Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
5
6recent -stable kernels have their own fallback definition of is_compat_task
7
8 #define is_compat_task() (0)
9
10To protect against this double definition of is_compat_task we can check
11to see if it is already defined, and skip the lttng variant.
12
13Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
14---
15 lttng-syscalls.c | 4 ++++
16 1 files changed, 4 insertions(+), 0 deletions(-)
17
18diff --git a/lttng-syscalls.c b/lttng-syscalls.c
19index 9de3c07..80d0f05 100644
20--- a/lttng-syscalls.c
21+++ b/lttng-syscalls.c
22@@ -17,12 +17,16 @@
23 #include "ltt-events.h"
24
25 #ifndef CONFIG_COMPAT
26+
27+#ifndef is_compat_task
28 static inline int is_compat_task(void)
29 {
30 return 0;
31 }
32 #endif
33
34+#endif
35+
36 static
37 void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
38
39--
401.7.5.4
41
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
index fa7bbec..4c78f36 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
@@ -15,7 +15,8 @@ PV = "2.0.pre11+git${SRCREV}"
15PR = "r0" 15PR = "r0"
16 16
17SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ 17SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
18 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" 18 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
19 file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch"
19 20
20export INSTALL_MOD_DIR="kernel/lttng-modules" 21export INSTALL_MOD_DIR="kernel/lttng-modules"
21export KERNEL_SRC="${STAGING_KERNEL_DIR}" 22export KERNEL_SRC="${STAGING_KERNEL_DIR}"