aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c2
-rw-r--r--kernel/sched.c4
-rw-r--r--kernel/taskstats.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b2b2c2b0a49b..dabfefb4ffdf 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -412,7 +412,7 @@ static int hrtimer_reprogram(struct hrtimer *timer,
412 /* 412 /*
413 * When the callback is running, we do not reprogram the clock event 413 * When the callback is running, we do not reprogram the clock event
414 * device. The timer callback is either running on a different CPU or 414 * device. The timer callback is either running on a different CPU or
415 * the callback is executed in the hrtimer_interupt context. The 415 * the callback is executed in the hrtimer_interrupt context. The
416 * reprogramming is handled either by the softirq, which called the 416 * reprogramming is handled either by the softirq, which called the
417 * callback or at the end of the hrtimer_interrupt. 417 * callback or at the end of the hrtimer_interrupt.
418 */ 418 */
diff --git a/kernel/sched.c b/kernel/sched.c
index afe76ec2e7fe..a54bd9dfbedb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5146,7 +5146,7 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int dest_cpu)
5146} 5146}
5147 5147
5148/* 5148/*
5149 * Figure out where task on dead CPU should go, use force if neccessary. 5149 * Figure out where task on dead CPU should go, use force if necessary.
5150 * NOTE: interrupts should be disabled by the caller 5150 * NOTE: interrupts should be disabled by the caller
5151 */ 5151 */
5152static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 5152static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
@@ -5525,7 +5525,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
5525 5525
5526 case CPU_ONLINE: 5526 case CPU_ONLINE:
5527 case CPU_ONLINE_FROZEN: 5527 case CPU_ONLINE_FROZEN:
5528 /* Strictly unneccessary, as first user will wake it. */ 5528 /* Strictly unnecessary, as first user will wake it. */
5529 wake_up_process(cpu_rq(cpu)->migration_thread); 5529 wake_up_process(cpu_rq(cpu)->migration_thread);
5530 break; 5530 break;
5531 5531
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 9f360f68aad6..354e74bc17c1 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -263,7 +263,7 @@ out:
263 263
264 stats->version = TASKSTATS_VERSION; 264 stats->version = TASKSTATS_VERSION;
265 /* 265 /*
266 * Accounting subsytems can also add calls here to modify 266 * Accounting subsystems can also add calls here to modify
267 * fields of taskstats. 267 * fields of taskstats.
268 */ 268 */
269 return rc; 269 return rc;