diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-22 12:33:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-22 12:33:23 +0000 |
| commit | 2305009118181260b45aab82f14bcbb659953ef1 (patch) | |
| tree | 0c2c9469d7ae37f38449116971bf16b10355e19c /kernel/irq/irqdesc.c | |
| parent | 0e9b1909c3c660060d94a0a8a15c5299de97a4aa (diff) | |
| parent | b30814c74c184bbb231e24d6c857699af338468b (diff) | |
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big.LITTLEv3.10/topic/big.LITTLE
Conflicts:
kernel/irq/irqdesc.c
linaro/configs/big-LITTLE-MP.conf
Diffstat (limited to 'kernel/irq/irqdesc.c')
| -rw-r--r-- | kernel/irq/irqdesc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 473b2b6eccb..20ecfb0984e 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -36,12 +36,20 @@ static int __init irq_affinity_setup(char *str) } __setup("irqaffinity=", irq_affinity_setup); +extern struct cpumask hmp_slow_cpu_mask; + static void __init init_irq_default_affinity(void) { #ifdef CONFIG_CPUMASK_OFFSTACK if (!irq_default_affinity) zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); #endif +#ifdef CONFIG_SCHED_HMP + if (!cpumask_empty(&hmp_slow_cpu_mask)) { + cpumask_copy(irq_default_affinity, &hmp_slow_cpu_mask); + return; + } +#endif if (cpumask_empty(irq_default_affinity)) cpumask_setall(irq_default_affinity); } |