2 files changed, 10 insertions, 6 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index ed3caf26990d..d941ddc9ec1d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -757,14 +757,14 @@ const_debug unsigned int sysctl_sched_features =
 #define SCHED_FEAT(name, enabled)       \
         #name ,
 
-__read_mostly char *sched_feat_names[] = {
+static __read_mostly char *sched_feat_names[] = {
 #include "sched_features.h"
         NULL
 };
 
 #undef SCHED_FEAT
 
-int sched_feat_open(struct inode *inode, struct file *filp)
+static int sched_feat_open(struct inode *inode, struct file *filp)
 {
         filp->private_data = inode->i_private;
         return 0;
@@ -4341,8 +4341,10 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
         struct rq *rq = this_rq();
         cputime64_t tmp;
 
-        if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0))
-                return account_guest_time(p, cputime);
+        if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) {
+                account_guest_time(p, cputime);
+                return;
+        }
 
         p->stime = cputime_add(p->stime, cputime);
 
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 1295ddc5656b..e8e5ad2614b0 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -841,8 +841,10 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
          * queued ticks are scheduled to match the slice, so don't bother
          * validating it and just reschedule.
          */
-        if (queued)
-                return resched_task(rq_of(cfs_rq)->curr);
+        if (queued) {
+                resched_task(rq_of(cfs_rq)->curr);
+                return;
+        }
         /*
          * don't let the period tick interfere with the hrtick preemption
          */