projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
time_64.c
diff --git
a/arch/x86/kernel/time_64.c
b/arch/x86/kernel/time_64.c
index e6e695acd725739a645b5664f83a8356ff5b13a7..241ec3923f611bf03cb266362409924daabf1f6f 100644
(file)
--- a/
arch/x86/kernel/time_64.c
+++ b/
arch/x86/kernel/time_64.c
@@
-115,7
+115,7
@@
unsigned long __init calibrate_cpu(void)
static struct irqaction irq0 = {
.handler = timer_interrupt,
- .flags = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,
+ .flags = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING
| IRQF_TIMER
,
.mask = CPU_MASK_NONE,
.name = "timer"
};