sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Bruce Ashfield 2012-03-19 13:53:57 -04:00 committed by Richard Purdie
parent a9873f12e5
commit da07197040
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch Normal file
View File

@ -0,0 +1,41 @@
From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
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 <bruce.ashfield@windriver.com>
---
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

3
meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
View File

@ -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}"