summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-28 07:48:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-28 07:48:01 -0800
commit76c03f0f5d496be6a6b81df5f6e16551c07b3c0a (patch)
tree94082369be0ec55316ca13cd27d1e1580fb1c71d /kernel
parentf055ae04aeb0fd1d4373916c43b08481fcd9e5bc (diff)
parentc219b7ddb6a3524a61a89438d86e4a8639706308 (diff)
downloadlinux-76c03f0f5d496be6a6b81df5f6e16551c07b3c0a.tar.gz
linux-76c03f0f5d496be6a6b81df5f6e16551c07b3c0a.tar.bz2
linux-76c03f0f5d496be6a6b81df5f6e16551c07b3c0a.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixlet from Thomas Gleixner: "A trivial printk typo fix" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/deadline: Fix trivial typo in printk() message
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/deadline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index cd64c979d0e1..57b939c81bce 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -420,7 +420,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,
* entity.
*/
if (dl_time_before(dl_se->deadline, rq_clock(rq))) {
- printk_deferred_once("sched: DL replenish lagged to much\n");
+ printk_deferred_once("sched: DL replenish lagged too much\n");
dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;
dl_se->runtime = pi_se->dl_runtime;
}