diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index afe76ec2e7fe..7581e331b139 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -3310,7 +3310,6 @@ unsigned long long task_sched_runtime(struct task_struct *p) | |||
3310 | /* | 3310 | /* |
3311 | * Account user cpu time to a process. | 3311 | * Account user cpu time to a process. |
3312 | * @p: the process that the cpu time gets accounted to | 3312 | * @p: the process that the cpu time gets accounted to |
3313 | * @hardirq_offset: the offset to subtract from hardirq_count() | ||
3314 | * @cputime: the cpu time spent in user space since the last update | 3313 | * @cputime: the cpu time spent in user space since the last update |
3315 | */ | 3314 | */ |
3316 | void account_user_time(struct task_struct *p, cputime_t cputime) | 3315 | void account_user_time(struct task_struct *p, cputime_t cputime) |
@@ -5146,7 +5145,7 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int dest_cpu) | |||
5146 | } | 5145 | } |
5147 | 5146 | ||
5148 | /* | 5147 | /* |
5149 | * Figure out where task on dead CPU should go, use force if neccessary. | 5148 | * Figure out where task on dead CPU should go, use force if necessary. |
5150 | * NOTE: interrupts should be disabled by the caller | 5149 | * NOTE: interrupts should be disabled by the caller |
5151 | */ | 5150 | */ |
5152 | static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) | 5151 | static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) |
@@ -5525,7 +5524,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
5525 | 5524 | ||
5526 | case CPU_ONLINE: | 5525 | case CPU_ONLINE: |
5527 | case CPU_ONLINE_FROZEN: | 5526 | case CPU_ONLINE_FROZEN: |
5528 | /* Strictly unneccessary, as first user will wake it. */ | 5527 | /* Strictly unnecessary, as first user will wake it. */ |
5529 | wake_up_process(cpu_rq(cpu)->migration_thread); | 5528 | wake_up_process(cpu_rq(cpu)->migration_thread); |
5530 | break; | 5529 | break; |
5531 | 5530 | ||