diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-14 12:13:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-14 12:13:45 +0100 |
| commit | e46d51787e23a607cac5f593ac9926743a636dff (patch) | |
| tree | 4efb93f31c6eacb8fcbaa137acf894ea8d309e0e /arch/mips/kernel | |
| parent | a4a0acf8e17e3d08e28b721ceceb898fbc959ceb (diff) | |
| parent | 4a046d1754ee6ebb6f399696805ed61ea0444d4c (diff) | |
| download | kernel_samsung_tuna-e46d51787e23a607cac5f593ac9926743a636dff.zip kernel_samsung_tuna-e46d51787e23a607cac5f593ac9926743a636dff.tar.gz kernel_samsung_tuna-e46d51787e23a607cac5f593ac9926743a636dff.tar.bz2 | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/irq-gic.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/smtc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c index 494a49a..87deb8f 100644 --- a/arch/mips/kernel/irq-gic.c +++ b/arch/mips/kernel/irq-gic.c @@ -187,7 +187,7 @@ static void gic_set_affinity(unsigned int irq, const struct cpumask *cpumask) set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); } - irq_desc[irq].affinity = *cpumask; + cpumask_copy(irq_desc[irq].affinity, cpumask); spin_unlock_irqrestore(&gic_lock, flags); } diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index b6cca01..d2c1ab1 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -686,7 +686,7 @@ void smtc_forward_irq(unsigned int irq) * and efficiency, we just pick the easiest one to find. */ - target = first_cpu(irq_desc[irq].affinity); + target = cpumask_first(irq_desc[irq].affinity); /* * We depend on the platform code to have correctly processed |