diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /arch/x86/mach-default/setup.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'arch/x86/mach-default/setup.c')
| -rw-r--r-- | arch/x86/mach-default/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index a265a7c63190..50b591871128 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
| @@ -96,7 +96,7 @@ void __init trap_init_hook(void) | |||
| 96 | 96 | ||
| 97 | static struct irqaction irq0 = { | 97 | static struct irqaction irq0 = { |
| 98 | .handler = timer_interrupt, | 98 | .handler = timer_interrupt, |
| 99 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, | 99 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, |
| 100 | .mask = CPU_MASK_NONE, | 100 | .mask = CPU_MASK_NONE, |
| 101 | .name = "timer" | 101 | .name = "timer" |
| 102 | }; | 102 | }; |