diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-10-26 11:21:16 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-27 09:45:00 +0100 |
| commit | 4b40886d4c3ef80f9dcb2e8d4fd807d0039e79f6 (patch) | |
| tree | 2bc963c75c1ec3abab43421e757a0484a0456248 | |
| parent | ddd4dd8aa69cefc0dee2462d2b68b2cfb7734506 (diff) | |
| download | poky-4b40886d4c3ef80f9dcb2e8d4fd807d0039e79f6.tar.gz | |
lttng-modules: remove unused lttng-syscalls patch
commit b7e184508 (lttng-2.0: fix srcrev/pv to match the recipe
filenames) removed the
lttng-sycalls-protect-is_compat_task-from-redefiniti.patch from the
SRC_URI but forgot to remove the patch itself.
(From OE-Core rev: 6745b927a40e523cfda4ce2ca6422d69a6791e8a)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch | 41 |
1 files changed, 0 insertions, 41 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 deleted file mode 100644 index 0056633806..0000000000 --- a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Mon, 19 Mar 2012 13:30:31 -0400 | ||
| 4 | Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition | ||
| 5 | |||
| 6 | recent -stable kernels have their own fallback definition of is_compat_task | ||
| 7 | |||
| 8 | #define is_compat_task() (0) | ||
| 9 | |||
| 10 | To protect against this double definition of is_compat_task we can check | ||
| 11 | to see if it is already defined, and skip the lttng variant. | ||
| 12 | |||
| 13 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 14 | --- | ||
| 15 | lttng-syscalls.c | 4 ++++ | ||
| 16 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/lttng-syscalls.c b/lttng-syscalls.c | ||
| 19 | index 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 | -- | ||
| 40 | 1.7.5.4 | ||
| 41 | |||
