leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'timers/urgent' into timers/core

Browse Source 
Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2018-01-27 15:35:29 +01:00
parent b1a31a5f5f d5421ea43d
commit 303c146df1
539 changed files with 7445 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/time/hrtimer.c
View File

@@ -1760,7 +1760,11 @@ int hrtimers_prepare_cpu(unsigned int cpu)
}
cpu_base->cpu = cpu;
cpu_base->active_bases = 0;
cpu_base->hres_active = 0;
cpu_base->hang_detected = 0;
cpu_base->next_timer = NULL;
cpu_base->softirq_next_timer = NULL;
cpu_base->expires_next = KTIME_MAX;
cpu_base->softirq_expires_next = KTIME_MAX;
return 0;