|
@@ -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);
|
|
|
|