diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-11-28 15:34:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:08 +0000 |
commit | 0724f409628d8c870194bfdaf632da1359889552 (patch) | |
tree | d6fd400f09f7f065cd304ce23f00012c931c34bf /meta/recipes-kernel/sysprof/files | |
parent | 3c01e48bb4ef53a1112993dd9cfe1aa66928c0d1 (diff) | |
download | poky-0724f409628d8c870194bfdaf632da1359889552.tar.gz |
sysprof: update to 3.22.2
Drop 0001-Forward-port-mips-arm-memory-barrier-patches.patch; upstream
is using standard C11 facilities for this now.
Drop 0001-callgraph-Use-U64_TO_POINTER.patch; it has been merged upstream.
(From OE-Core rev: 9425992b59afa887fbbb1d3b3598f08757de4765)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/sysprof/files')
-rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch | 38 | ||||
-rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch | 29 |
2 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch deleted file mode 100644 index 92e804f98d..0000000000 --- a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Sat, 11 Jun 2016 22:45:37 +0300 | ||
4 | Subject: [PATCH] Forward port mips & arm memory barrier patches | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
8 | --- | ||
9 | lib/util/util.h | 15 +++++++++++++++ | ||
10 | 1 file changed, 15 insertions(+) | ||
11 | |||
12 | diff --git a/lib/util/util.h b/lib/util/util.h | ||
13 | index 591722d..0768056 100644 | ||
14 | --- a/lib/util/util.h | ||
15 | +++ b/lib/util/util.h | ||
16 | @@ -29,4 +29,19 @@ | ||
17 | #define read_barrier() asm volatile("" ::: "memory") | ||
18 | #endif | ||
19 | |||
20 | +#ifdef __arm__ | ||
21 | +/* | ||
22 | + * Use the __kuser_memory_barrier helper in the CPU helper page. See | ||
23 | + * arch/arm/kernel/entry-armv.S in the kernel source for details. | ||
24 | + */ | ||
25 | +#define read_barrier() ((void(*)(void))0xffff0fa0)() | ||
26 | +#endif | ||
27 | + | ||
28 | +#ifdef __mips__ | ||
29 | +#define read_barrier() asm volatile(".set mips2\n\t" \ | ||
30 | + "sync\n\t" \ | ||
31 | + ".set mips0" ::: "memory") | ||
32 | +#endif | ||
33 | + | ||
34 | + | ||
35 | #endif /* SP_UTIL_H */ | ||
36 | -- | ||
37 | 2.1.4 | ||
38 | |||
diff --git a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch deleted file mode 100644 index ac1384c9b0..0000000000 --- a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 10 Jun 2016 14:01:54 +0300 | ||
4 | Subject: [PATCH] callgraph: Use U64_TO_POINTER | ||
5 | |||
6 | This fixes a "cast to pointer from integer of different size" on i586. | ||
7 | |||
8 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
9 | Upstream-Status: Pending | ||
10 | --- | ||
11 | lib/sp-callgraph-view.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c | ||
15 | index 02cc17b..58315b0 100644 | ||
16 | --- a/lib/sp-callgraph-view.c | ||
17 | +++ b/lib/sp-callgraph-view.c | ||
18 | @@ -135,7 +135,7 @@ build_functions_store (StackNode *node, | ||
19 | |||
20 | gtk_list_store_append (state->store, &iter); | ||
21 | gtk_list_store_set (state->store, &iter, | ||
22 | - COLUMN_NAME, (const gchar *)node->data, | ||
23 | + COLUMN_NAME, U64_TO_POINTER(node->data), | ||
24 | COLUMN_SELF, 100.0 * size / state->profile_size, | ||
25 | COLUMN_TOTAL, 100.0 * total / state->profile_size, | ||
26 | COLUMN_POINTER, node, | ||
27 | -- | ||
28 | 2.1.4 | ||
29 | |||