summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/trusty/Kbuild4
-rw-r--r--drivers/trusty/trusty-log.c2
-rw-r--r--drivers/trusty/trusty-sched-share-api.h2
-rw-r--r--drivers/trusty/trusty-sched-share.c1
4 files changed, 4 insertions, 5 deletions
diff --git a/drivers/trusty/Kbuild b/drivers/trusty/Kbuild
index 538352f..1efdd13 100644
--- a/drivers/trusty/Kbuild
+++ b/drivers/trusty/Kbuild
@@ -4,9 +4,7 @@
#
# Needed for the trace points
-CFLAGS_trusty.o = -I$(srctree)/$(src)
-CFLAGS_trusty-irq.o = -I$(srctree)/$(src)
-CFLAGS_trusty-ipc.o = -I$(srctree)/$(src)
+ccflags-y += -I$(srctree)/$(src)/
obj-$(CONFIG_TRUSTY) += trusty-core.o
trusty-core-objs += trusty.o trusty-mem.o trusty-sched-share.o
diff --git a/drivers/trusty/trusty-log.c b/drivers/trusty/trusty-log.c
index 0c5a121..425441f 100644
--- a/drivers/trusty/trusty-log.c
+++ b/drivers/trusty/trusty-log.c
@@ -677,7 +677,7 @@ static int trusty_log_sfile_dev_release(struct inode *inode,
return 0;
}
-ssize_t trusty_log_sfile_dev_read(struct file *filp, char __user *buf,
+static ssize_t trusty_log_sfile_dev_read(struct file *filp, char __user *buf,
size_t size, loff_t *ppos)
{
struct seq_file *sfile;
diff --git a/drivers/trusty/trusty-sched-share-api.h b/drivers/trusty/trusty-sched-share-api.h
index 412704a..58c76d7 100644
--- a/drivers/trusty/trusty-sched-share-api.h
+++ b/drivers/trusty/trusty-sched-share-api.h
@@ -21,7 +21,7 @@ void trusty_unregister_sched_share(struct trusty_sched_share_state *sched_share_
void trusty_free_sched_share(struct trusty_sched_share_state *sched_share_state);
int trusty_get_requested_nice(unsigned int cpu_num, struct trusty_sched_share_state *tcpu_state);
-int trusty_set_actual_nice(unsigned int cpu_num, struct trusty_sched_share_state *tcpu_state,
+void trusty_set_actual_nice(unsigned int cpu_num, struct trusty_sched_share_state *tcpu_state,
int nice);
#endif /* _TRUSTY_SCHED_SHARE_API_H_ */
diff --git a/drivers/trusty/trusty-sched-share.c b/drivers/trusty/trusty-sched-share.c
index 3670bf4..07b0d7e 100644
--- a/drivers/trusty/trusty-sched-share.c
+++ b/drivers/trusty/trusty-sched-share.c
@@ -12,6 +12,7 @@
#include <linux/scatterlist.h>
#include <linux/trusty/trusty.h>
#include "trusty-sched-share.h"
+#include "trusty-sched-share-api.h"
/**
* struct trusty_sched_share_state - Trusty share resources state local to Trusty-Driver