diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-08-05 22:37:21 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-08 13:41:21 +0100 |
| commit | d26c9bd80d8ee5fd125a487435e5c976ea13916a (patch) | |
| tree | aca37e7966dd3f882aa394fc9674c7b454e2edfa /meta/recipes-kernel/lttng/lttng-ust | |
| parent | ab1e331a88f70c6e8902b5b6431b2259883e41c6 (diff) | |
| download | poky-d26c9bd80d8ee5fd125a487435e5c976ea13916a.tar.gz | |
lttng-ust: Update to 0.15
This address [YOCTO #1005] which was waiting for upstream updates
from the lttng and GDB teams.
(From OE-Core rev: 0d240f56ea0128c1228f7cfe1471039a7b602a88)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-ust')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch deleted file mode 100644 index f4ea196c71..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | uClibc does not have sched_getcpu() implemented. So we create a wrapper | ||
| 2 | to getcpu syscall when compiling for uclibc. | ||
| 3 | |||
| 4 | So far execinfo.h does not exist on uclibc but it turns out to be that | ||
| 5 | this header is not needed even in eglibc case so it can be removed | ||
| 6 | |||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | |||
| 9 | Upstream-Status: Accepted | ||
| 10 | |||
| 11 | Index: ust-0.12/libust/tracer.h | ||
| 12 | =================================================================== | ||
| 13 | --- ust-0.12.orig/libust/tracer.h | ||
| 14 | +++ ust-0.12/libust/tracer.h | ||
| 15 | @@ -342,14 +342,22 @@ static __inline__ void ltt_write_trace_h | ||
| 16 | header->start_freq = trace->start_freq; | ||
| 17 | header->freq_scale = trace->freq_scale; | ||
| 18 | } | ||
| 19 | - | ||
| 20 | +#ifdef __UCLIBC__ | ||
| 21 | +#define sched_getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) | ||
| 22 | +#endif | ||
| 23 | #ifndef UST_VALGRIND | ||
| 24 | |||
| 25 | static __inline__ int ust_get_cpu(void) | ||
| 26 | { | ||
| 27 | int cpu; | ||
| 28 | |||
| 29 | +#ifdef __UCLIBC__ | ||
| 30 | + int c, s; | ||
| 31 | + s = syscall(__NR_getcpu, &c, NULL, NULL); | ||
| 32 | + cpu = (s == -1) ? s : c; | ||
| 33 | +#else | ||
| 34 | cpu = sched_getcpu(); | ||
| 35 | +#endif | ||
| 36 | if (likely(cpu >= 0)) | ||
| 37 | return cpu; | ||
| 38 | /* | ||
| 39 | Index: ust-0.12/libustcomm/ustcomm.c | ||
| 40 | =================================================================== | ||
| 41 | --- ust-0.12.orig/libustcomm/ustcomm.c | ||
| 42 | +++ ust-0.12/libustcomm/ustcomm.c | ||
| 43 | @@ -31,7 +31,6 @@ | ||
| 44 | #include <stdio.h> | ||
| 45 | #include <stdlib.h> | ||
| 46 | #include <string.h> | ||
| 47 | -#include <execinfo.h> | ||
| 48 | |||
| 49 | #include "ustcomm.h" | ||
| 50 | #include "usterr.h" | ||
