mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: remove extraneous checks in manage.c genirq: Expose default irq affinity mask (take 3)
This commit is contained in:
commit
61d97f4fcf
7 changed files with 136 additions and 41 deletions
|
|
@ -42,8 +42,7 @@ void ack_bad_irq(unsigned int irq)
|
|||
#ifdef CONFIG_SMP
|
||||
static char irq_user_affinity[NR_IRQS];
|
||||
|
||||
int
|
||||
select_smp_affinity(unsigned int irq)
|
||||
int irq_select_affinity(unsigned int irq)
|
||||
{
|
||||
static int last_cpu;
|
||||
int cpu = last_cpu + 1;
|
||||
|
|
@ -51,7 +50,7 @@ select_smp_affinity(unsigned int irq)
|
|||
if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])
|
||||
return 1;
|
||||
|
||||
while (!cpu_possible(cpu))
|
||||
while (!cpu_possible(cpu) || !cpu_isset(cpu, irq_default_affinity))
|
||||
cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
|
||||
last_cpu = cpu;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue