From 3186264a203a500ad48c410ffa62a5b4fe4cea91 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 24 Apr 2008 18:17:55 -0700
Subject: [PATCH] --- yaml --- r: 96037 b: refs/heads/master c:
 983ed7a66bcec9dc307d89dc7af47cdf209e56af h: refs/heads/master i:   96035:
 724592b64ae28eb687d7975642246a8a8af0e54b v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/sched.c      | 10 ++++++----
 trunk/kernel/sched_fair.c |  6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4045ade8e2ec..6ea9cf2911ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d478c2cfaa2476f8b6876f9eb4d8fddcfa986479
+refs/heads/master: 983ed7a66bcec9dc307d89dc7af47cdf209e56af
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index ed3caf26990d..d941ddc9ec1d 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/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/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 1295ddc5656b..e8e5ad2614b0 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/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
 	 */