diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /kernel/sched/cpudeadline.c | |
parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'kernel/sched/cpudeadline.c')
-rw-r--r-- | kernel/sched/cpudeadline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index 5be58820465c..d4184498c9f5 100644 --- a/kernel/sched/cpudeadline.c +++ b/kernel/sched/cpudeadline.c | |||
@@ -168,7 +168,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl, int is_valid) | |||
168 | 168 | ||
169 | if (old_idx == IDX_INVALID) { | 169 | if (old_idx == IDX_INVALID) { |
170 | cp->size++; | 170 | cp->size++; |
171 | cp->elements[cp->size - 1].dl = 0; | 171 | cp->elements[cp->size - 1].dl = dl; |
172 | cp->elements[cp->size - 1].cpu = cpu; | 172 | cp->elements[cp->size - 1].cpu = cpu; |
173 | cp->elements[cpu].idx = cp->size - 1; | 173 | cp->elements[cpu].idx = cp->size - 1; |
174 | cpudl_change_key(cp, cp->size - 1, dl); | 174 | cpudl_change_key(cp, cp->size - 1, dl); |