diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /kernel/irq/matrix.c | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'kernel/irq/matrix.c')
| -rw-r--r-- | kernel/irq/matrix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c index 7df2480005f8..0ba0dd8863a7 100644 --- a/kernel/irq/matrix.c +++ b/kernel/irq/matrix.c | |||
| @@ -384,7 +384,9 @@ unsigned int irq_matrix_available(struct irq_matrix *m, bool cpudown) | |||
| 384 | { | 384 | { |
| 385 | struct cpumap *cm = this_cpu_ptr(m->maps); | 385 | struct cpumap *cm = this_cpu_ptr(m->maps); |
| 386 | 386 | ||
| 387 | return (m->global_available - cpudown) ? cm->available : 0; | 387 | if (!cpudown) |
| 388 | return m->global_available; | ||
| 389 | return m->global_available - cm->available; | ||
| 388 | } | 390 | } |
| 389 | 391 | ||
| 390 | /** | 392 | /** |