aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c10
1 files changed, 6 insertions, 4 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 =
757#define SCHED_FEAT(name, enabled) \ 757#define SCHED_FEAT(name, enabled) \
758 #name , 758 #name ,
759 759
760__read_mostly char *sched_feat_names[] = { 760static __read_mostly char *sched_feat_names[] = {
761#include "sched_features.h" 761#include "sched_features.h"
762 NULL 762 NULL
763}; 763};
764 764
765#undef SCHED_FEAT 765#undef SCHED_FEAT
766 766
767int sched_feat_open(struct inode *inode, struct file *filp) 767static int sched_feat_open(struct inode *inode, struct file *filp)
768{ 768{
769 filp->private_data = inode->i_private; 769 filp->private_data = inode->i_private;
770 return 0; 770 return 0;
@@ -4341,8 +4341,10 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
4341 struct rq *rq = this_rq(); 4341 struct rq *rq = this_rq();
4342 cputime64_t tmp; 4342 cputime64_t tmp;
4343 4343
4344 if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) 4344 if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) {
4345 return account_guest_time(p, cputime); 4345 account_guest_time(p, cputime);
4346 return;
4347 }
4346 4348
4347 p->stime = cputime_add(p->stime, cputime); 4349 p->stime = cputime_add(p->stime, cputime);
4348 4350