summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-09-07 07:45:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:39 +0100
commit3d8fd2f0ec1778aa36cb95194c474e57dae455e4 (patch)
tree409fe298a5b458fe26a614e632eafe43be5cc44d /meta/recipes-kernel
parentc8f4822c4d46fb0e222913edeabc33e4bc6d4166 (diff)
downloadpoky-3d8fd2f0ec1778aa36cb95194c474e57dae455e4.tar.gz
latencytop: Fix build with clang
Clang is stricter with syntax checking and flags the functions return values if they dont match with function signatures, Fixed thusly (From OE-Core rev: 91b8c2900570720d56a123a90e927f49a6a6095f) Signed-off-by: Khem Raj <raj.khem@gmail.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')
-rw-r--r--meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch64
-rw-r--r--meta/recipes-kernel/latencytop/latencytop_0.5.bb6
2 files changed, 68 insertions, 2 deletions
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
new file mode 100644
index 0000000000..b248133460
--- /dev/null
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
@@ -0,0 +1,64 @@
1From db112739dc4f608a968b8104b382955dc3d96ca3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Sep 2015 07:40:10 +0000
4Subject: [PATCH] Rectify the function signatures to fix prototype mismatches
5
6clang is less forgiving when it comes to coding standards, correct the
7function signatures to reflect the function logic
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 fsync.c | 7 ++++---
14 latencytop.h | 2 +-
15 2 files changed, 5 insertions(+), 4 deletions(-)
16
17diff --git a/fsync.c b/fsync.c
18index 82dff0e..5cefba9 100644
19--- a/fsync.c
20+++ b/fsync.c
21@@ -51,7 +51,7 @@ struct fsync_files {
22 static GList *fsync_data;
23
24
25-static chain_file(struct fsync_process *proc, char *filename)
26+static void chain_file(struct fsync_process *proc, char *filename)
27 {
28 struct fsync_files *file;
29 GList *item;
30@@ -75,7 +75,7 @@ static chain_file(struct fsync_process *proc, char *filename)
31 proc->files = g_list_append(proc->files, file);
32 }
33
34-static report_file(char *process, char *file)
35+static void report_file(char *process, char *file)
36 {
37 struct fsync_process *proc;
38 GList *item;
39@@ -157,9 +157,10 @@ int enable_fsync_tracer(void)
40 write_to_file("/sys/kernel/debug/tracing/current_tracer", "fsync");
41 write_to_file("/sys/kernel/debug/tracing/iter_ctrl", "ftrace_printk");
42 write_to_file("/sys/kernel/debug/tracing/tracing_on", "1");
43+ return ret;
44 }
45
46-int disable_fsync_tracer(void)
47+void disable_fsync_tracer(void)
48 {
49 write_to_file("/sys/kernel/debug/tracing/tracing_on", "0");
50 }
51diff --git a/latencytop.h b/latencytop.h
52index 5394d73..9d107a8 100644
53--- a/latencytop.h
54+++ b/latencytop.h
55@@ -54,5 +54,5 @@ extern char *translate(char *line);
56 extern void init_translations(char *filename);
57 extern int fsync_display(int duration);
58 extern int enable_fsync_tracer(void);
59-extern int disable_fsync_tracer(void);
60+extern void disable_fsync_tracer(void);
61 extern void update_list(void);
62--
632.5.1
64
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index cb0a3c5ed1..f31f1bb7ab 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -10,7 +10,9 @@ PR = "r3"
10 10
11SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/73bb3371c6ee0b0e68e25289027e865c/${BP}.tar.gz \ 11SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/73bb3371c6ee0b0e68e25289027e865c/${BP}.tar.gz \
12 file://latencytop-makefile.patch \ 12 file://latencytop-makefile.patch \
13 file://latencytop-fsync.patch" 13 file://latencytop-fsync.patch \
14 file://0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch \
15"
14 16
15SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c" 17SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
16SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef" 18SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
@@ -21,7 +23,7 @@ PACKAGECONFIG[x11] = ",,gtk+"
21 23
22EXTRA_OEMAKE_X = "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'HAS_GTK_GUI=1', '', d)}" 24EXTRA_OEMAKE_X = "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'HAS_GTK_GUI=1', '', d)}"
23 25
24CFLAGS += "${LDFLAGS}" 26#CFLAGS += "${LDFLAGS}"
25 27
26do_install() { 28do_install() {
27 oe_runmake install DESTDIR=${D} ${EXTRA_OEMAKE_X} 29 oe_runmake install DESTDIR=${D} ${EXTRA_OEMAKE_X}