projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perf/urgent, to pick up dependent commits
[platform/kernel/linux-rpi.git]
/
arch
/
x86
/
kernel
/
time.c
diff --git
a/arch/x86/kernel/time.c
b/arch/x86/kernel/time.c
index
879af86
..
749d189
100644
(file)
--- a/
arch/x86/kernel/time.c
+++ b/
arch/x86/kernel/time.c
@@
-85,6
+85,11
@@
void __init hpet_time_init(void)
static __init void x86_late_time_init(void)
{
x86_init.timers.timer_init();
+ /*
+ * After PIT/HPET timers init, select and setup
+ * the final interrupt mode for delivering IRQs.
+ */
+ x86_init.irqs.intr_mode_init();
tsc_init();
}