Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c16a6dc authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched: Fix compiler warning about declared inline after use 



kernel/sched/fair.c:420: warning: 'account_cfs_rq_runtime' declared inline after being called
kernel/sched/fair.c:420: warning: previous declaration of 'account_cfs_rq_runtime' was here
kernel/sched/fair.c:1165: warning: 'return_cfs_rq_runtime' declared inlineafter being called
kernel/sched/fair.c:1165: warning: previous declaration of 'return_cfs_rq_runtime' was here

Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20120321200717.49BB4A024E@akpm.mtv.corp.google.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dd9b238c

kernel/sched/fair.c

+8 −8
Original line number Diff line number Diff line
@@ -416,8 +416,8 @@ find_matching_se(struct sched_entity **se, struct sched_entity **pse) 


#endif	/* CONFIG_FAIR_GROUP_SCHED */



static void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,

				   unsigned long delta_exec);

static __always_inline

void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec);



/**************************************************************

 * Scheduling class tree data structure manipulation methods:
@@ -1162,7 +1162,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se) 
		__clear_buddies_skip(se);

}



static void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);

static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);



static void

dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -1546,8 +1546,8 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, 
		resched_task(rq_of(cfs_rq)->curr);

}



static __always_inline void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,

						   unsigned long delta_exec)

static __always_inline

void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec)

{

	if (!cfs_bandwidth_used() || !cfs_rq->runtime_enabled)

		return;
@@ -2073,11 +2073,11 @@ void unthrottle_offline_cfs_rqs(struct rq *rq) 
}



#else /* CONFIG_CFS_BANDWIDTH */

static void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,

				     unsigned long delta_exec) {}

static __always_inline

void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec) {}

static void check_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}

static void check_enqueue_throttle(struct cfs_rq *cfs_rq) {}

static void return_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}

static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}



static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq)

{