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 | openembedded-core-contrib-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 @@ -From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Sat, 11 Jun 2016 22:45:37 +0300 -Subject: [PATCH] Forward port mips & arm memory barrier patches - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - lib/util/util.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/lib/util/util.h b/lib/util/util.h -index 591722d..0768056 100644 ---- a/lib/util/util.h -+++ b/lib/util/util.h -@@ -29,4 +29,19 @@ - #define read_barrier() asm volatile("" ::: "memory") - #endif - -+#ifdef __arm__ -+/* -+ * Use the __kuser_memory_barrier helper in the CPU helper page. See -+ * arch/arm/kernel/entry-armv.S in the kernel source for details. -+ */ -+#define read_barrier() ((void(*)(void))0xffff0fa0)() -+#endif -+ -+#ifdef __mips__ -+#define read_barrier() asm volatile(".set mips2\n\t" \ -+ "sync\n\t" \ -+ ".set mips0" ::: "memory") -+#endif -+ -+ - #endif /* SP_UTIL_H */ --- -2.1.4 - 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 @@ -From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 10 Jun 2016 14:01:54 +0300 -Subject: [PATCH] callgraph: Use U64_TO_POINTER - -This fixes a "cast to pointer from integer of different size" on i586. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Pending ---- - lib/sp-callgraph-view.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c -index 02cc17b..58315b0 100644 ---- a/lib/sp-callgraph-view.c -+++ b/lib/sp-callgraph-view.c -@@ -135,7 +135,7 @@ build_functions_store (StackNode *node, - - gtk_list_store_append (state->store, &iter); - gtk_list_store_set (state->store, &iter, -- COLUMN_NAME, (const gchar *)node->data, -+ COLUMN_NAME, U64_TO_POINTER(node->data), - COLUMN_SELF, 100.0 * size / state->profile_size, - COLUMN_TOTAL, 100.0 * total / state->profile_size, - COLUMN_POINTER, node, --- -2.1.4 - |