Skip to content

Commit

Permalink
sched: add statics, don't return void expressions
Browse files Browse the repository at this point in the history
Noticed by sparse:
kernel/sched.c:760:20: warning: symbol 'sched_feat_names' was not declared. Should it be static?
kernel/sched.c:767:5: warning: symbol 'sched_feat_open' was not declared. Should it be static?
kernel/sched_fair.c:845:3: warning: returning void-valued expression
kernel/sched.c:4386:3: warning: returning void-valued expression

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Harvey Harrison authored and Ingo Molnar committed May 5, 2008
1 parent d478c2c commit 983ed7a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
10 changes: 6 additions & 4 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 4 additions & 2 deletions kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down

0 comments on commit 983ed7a

Please sign in to comment.