From 53db58982b7af59d75fc11b73475e9d71e6927ac Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 19 Mar 2012 13:53:57 -0400 Subject: 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. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- ...ls-protect-is_compat_task-from-redefiniti.patch | 41 ++++++++++++++++++++++ .../lttng-2.0/lttng-modules_2.0.pre11.bb | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch 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 0000000000..0056633806 --- /dev/null +++ b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch @@ -0,0 +1,41 @@ +From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Mon, 19 Mar 2012 13:30:31 -0400 +Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition + +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. + +Signed-off-by: Bruce Ashfield +--- + lttng-syscalls.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/lttng-syscalls.c b/lttng-syscalls.c +index 9de3c07..80d0f05 100644 +--- a/lttng-syscalls.c ++++ b/lttng-syscalls.c +@@ -17,12 +17,16 @@ + #include "ltt-events.h" + + #ifndef CONFIG_COMPAT ++ ++#ifndef is_compat_task + static inline int is_compat_task(void) + { + return 0; + } + #endif + ++#endif ++ + static + void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); + +-- +1.7.5.4 + 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 fa7bbec8d2..4c78f36ba0 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}" PR = "r0" SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ - file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" + file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ + file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch" export INSTALL_MOD_DIR="kernel/lttng-modules" export KERNEL_SRC="${STAGING_KERNEL_DIR}" -- cgit v1.2.3