diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:38 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:38 +0100 |
commit | c3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch) | |
tree | 426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /arch/mips/kernel/cevt-sb1250.c | |
parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'arch/mips/kernel/cevt-sb1250.c')
-rw-r--r-- | arch/mips/kernel/cevt-sb1250.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/cevt-sb1250.c b/arch/mips/kernel/cevt-sb1250.c index 63ac3ad462b..a2eebaafda5 100644 --- a/arch/mips/kernel/cevt-sb1250.c +++ b/arch/mips/kernel/cevt-sb1250.c @@ -125,7 +125,7 @@ void __cpuinit sb1250_clockevent_init(void) cd->min_delta_ns = clockevent_delta2ns(2, cd); cd->rating = 200; cd->irq = irq; - cd->cpumask = cpumask_of_cpu(cpu); + cd->cpumask = cpumask_of(cpu); cd->set_next_event = sibyte_next_event; cd->set_mode = sibyte_set_mode; clockevents_register_device(cd); @@ -147,6 +147,6 @@ void __cpuinit sb1250_clockevent_init(void) action->name = name; action->dev_id = cd; - irq_set_affinity(irq, cpumask_of_cpu(cpu)); + irq_set_affinity(irq, cpumask_of(cpu)); setup_irq(irq, action); } |