diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
commit | 3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch) | |
tree | 5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /drivers/xen/events.c | |
parent | 723cbe0775514853c22dc45005af59c360916af1 (diff) | |
parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) |
Merge branch 'linus' into tracing/kmemtrace2
Diffstat (limited to 'drivers/xen/events.c')
-rw-r--r-- | drivers/xen/events.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 46625cd38743..eb0dfdeaa949 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -142,9 +142,6 @@ static void init_evtchn_cpu_bindings(void) | |||
142 | 142 | ||
143 | /* By default all event channels notify CPU#0. */ | 143 | /* By default all event channels notify CPU#0. */ |
144 | for_each_irq_desc(i, desc) { | 144 | for_each_irq_desc(i, desc) { |
145 | if (!desc) | ||
146 | continue; | ||
147 | |||
148 | desc->affinity = cpumask_of_cpu(0); | 145 | desc->affinity = cpumask_of_cpu(0); |
149 | } | 146 | } |
150 | #endif | 147 | #endif |
@@ -588,7 +585,7 @@ void rebind_evtchn_irq(int evtchn, int irq) | |||
588 | spin_unlock(&irq_mapping_update_lock); | 585 | spin_unlock(&irq_mapping_update_lock); |
589 | 586 | ||
590 | /* new event channels are always bound to cpu 0 */ | 587 | /* new event channels are always bound to cpu 0 */ |
591 | irq_set_affinity(irq, cpumask_of_cpu(0)); | 588 | irq_set_affinity(irq, cpumask_of(0)); |
592 | 589 | ||
593 | /* Unmask the event channel. */ | 590 | /* Unmask the event channel. */ |
594 | enable_irq(irq); | 591 | enable_irq(irq); |
@@ -617,9 +614,9 @@ static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu) | |||
617 | } | 614 | } |
618 | 615 | ||
619 | 616 | ||
620 | static void set_affinity_irq(unsigned irq, cpumask_t dest) | 617 | static void set_affinity_irq(unsigned irq, const struct cpumask *dest) |
621 | { | 618 | { |
622 | unsigned tcpu = first_cpu(dest); | 619 | unsigned tcpu = cpumask_first(dest); |
623 | rebind_irq_to_cpu(irq, tcpu); | 620 | rebind_irq_to_cpu(irq, tcpu); |
624 | } | 621 | } |
625 | 622 | ||