From bb197218e14a21dfac77653ca0ad62c2ce763684 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 13 Jan 2010 20:21:52 -0700
Subject: [PATCH] --- yaml --- r: 182498 b: refs/heads/master c:
 6d686f4564f3fc7c6e678852919e48ad331d276b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/sched_fair.c     | 2 +-
 trunk/kernel/sched_idletask.c | 2 +-
 trunk/kernel/sched_rt.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cb91b81d62f8..0929cc7a34c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d894837f23f491aa7ed167aae767fc07cfe6e6e6
+refs/heads/master: 6d686f4564f3fc7c6e678852919e48ad331d276b
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 42ac3c9f66f6..71778601c103 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -2076,7 +2076,7 @@ static void moved_group_fair(struct task_struct *p, int on_rq)
 }
 #endif
 
-unsigned int get_rr_interval_fair(struct rq *rq, struct task_struct *task)
+static unsigned int get_rr_interval_fair(struct rq *rq, struct task_struct *task)
 {
 	struct sched_entity *se = &task->se;
 	unsigned int rr_interval = 0;
diff --git a/trunk/kernel/sched_idletask.c b/trunk/kernel/sched_idletask.c
index 5f93b570d383..01332bfc61a7 100644
--- a/trunk/kernel/sched_idletask.c
+++ b/trunk/kernel/sched_idletask.c
@@ -97,7 +97,7 @@ static void prio_changed_idle(struct rq *rq, struct task_struct *p,
 		check_preempt_curr(rq, p, 0);
 }
 
-unsigned int get_rr_interval_idle(struct rq *rq, struct task_struct *task)
+static unsigned int get_rr_interval_idle(struct rq *rq, struct task_struct *task)
 {
 	return 0;
 }
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
index f48328ac216f..072b3fcee8d8 100644
--- a/trunk/kernel/sched_rt.c
+++ b/trunk/kernel/sched_rt.c
@@ -1721,7 +1721,7 @@ static void set_curr_task_rt(struct rq *rq)
 	dequeue_pushable_task(rq, p);
 }
 
-unsigned int get_rr_interval_rt(struct rq *rq, struct task_struct *task)
+static unsigned int get_rr_interval_rt(struct rq *rq, struct task_struct *task)
 {
 	/*
 	 * Time slice is 0 for SCHED_FIFO tasks