diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 22:30:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 22:30:23 +0200 |
| commit | fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49 (patch) | |
| tree | c77845e116145fe4e5f172c39f4da2f87b8476ce /arch/i386/mach-voyager/setup.c | |
| parent | ide-cs: recognize 2GB CompactFlash from Transcend (diff) | |
| parent | [VOYAGER] add smp alternatives (diff) | |
| download | linux-fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49.tar.xz linux-fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
[VOYAGER] add smp alternatives
[VOYAGER] Use modern techniques to setup and teardown low identiy mappings.
[VOYAGER] Convert the monitor thread to use the kthread API
[VOYAGER] clockevents driver: bring voyager in to line
[VOYAGER] clockevents: correct boot cpu is zero assumption
[VOYAGER] add smp_call_function_single
Diffstat (limited to 'arch/i386/mach-voyager/setup.c')
| -rw-r--r-- | arch/i386/mach-voyager/setup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/i386/mach-voyager/setup.c b/arch/i386/mach-voyager/setup.c index cfa16c151c8f..447bb105cf58 100644 --- a/arch/i386/mach-voyager/setup.c +++ b/arch/i386/mach-voyager/setup.c @@ -40,10 +40,16 @@ void __init trap_init_hook(void) { } -static struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL}; +static struct irqaction irq0 = { + .handler = timer_interrupt, + .flags = IRQF_DISABLED | IRQF_NOBALANCING, + .mask = CPU_MASK_NONE, + .name = "timer" +}; void __init time_init_hook(void) { + irq0.mask = cpumask_of_cpu(safe_smp_processor_id()); setup_irq(0, &irq0); } |