summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-08-05 22:37:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:41:21 +0100
commitd26c9bd80d8ee5fd125a487435e5c976ea13916a (patch)
treeaca37e7966dd3f882aa394fc9674c7b454e2edfa /meta/recipes-kernel
parentab1e331a88f70c6e8902b5b6431b2259883e41c6 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch50
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_0.15.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_0.12.bb)13
2 files changed, 7 insertions, 56 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 @@
1uClibc does not have sched_getcpu() implemented. So we create a wrapper
2to getcpu syscall when compiling for uclibc.
3
4So far execinfo.h does not exist on uclibc but it turns out to be that
5this header is not needed even in eglibc case so it can be removed
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Accepted
10
11Index: 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 /*
39Index: 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"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
index 5fca949f39..915e619c8c 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.15.bb
@@ -10,19 +10,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
10 10
11DEPENDS = "liburcu" 11DEPENDS = "liburcu"
12 12
13PR = "r0" 13PR = "r2"
14 14
15SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \ 15SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
16 file://uclibc-sched_getcpu.patch \ 16
17 " 17SRC_URI[md5sum] = "86c71486a70695dc0b2171ad16fc82b3"
18SRC_URI[sha256sum] = "7ff7ecdc051c0649d5fd21b5ceff4895ca95dc34f14cdc04e50de13cfd1903c5"
18 19
19SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043"
20SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c"
21 20
22S = "${WORKDIR}/ust-${PV}" 21S = "${WORKDIR}/ust-${PV}"
23 22
24inherit autotools 23inherit autotools
25 24
25#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
26
26# Due to liburcu not building on MIPS currently this recipe needs to 27# Due to liburcu not building on MIPS currently this recipe needs to
27# be limited also. 28# be limited also.
28# So here let us first suppport x86/arm/powerpc platforms now. 29# So here let us first suppport x86/arm/powerpc platforms now.