diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-29 21:50:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-29 21:50:08 -0400 |
| commit | 1b46bac6275506db73592aa8b9bd1d67c79b95dc (patch) | |
| tree | 4294a77a5532896dfcc6730584944becdeabcee0 /drivers/misc/cxl/irq.c | |
| parent | 65c4cbeba797e3fce68aba899e066f50e638e08d (diff) | |
| parent | d701cca6744fe0d67c86346dcfc9b128b17b5045 (diff) | |
Merge tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"A few more powerpc fixes for 4.6:
- cxl: Keep IRQ mappings on context teardown from Michael Neuling
- cxl: Poll for outstanding IRQs when detaching a context from
Michael Neuling
- Wire up preadv2 and pwritev2 syscalls from Rui Salvaterra"
* tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: wire up preadv2 and pwritev2 syscalls
cxl: Poll for outstanding IRQs when detaching a context
cxl: Keep IRQ mappings on context teardown
Diffstat (limited to 'drivers/misc/cxl/irq.c')
| -rw-r--r-- | drivers/misc/cxl/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c index be646dc41a2c..8def4553acba 100644 --- a/drivers/misc/cxl/irq.c +++ b/drivers/misc/cxl/irq.c | |||
| @@ -203,7 +203,6 @@ unsigned int cxl_map_irq(struct cxl *adapter, irq_hw_number_t hwirq, | |||
| 203 | void cxl_unmap_irq(unsigned int virq, void *cookie) | 203 | void cxl_unmap_irq(unsigned int virq, void *cookie) |
| 204 | { | 204 | { |
| 205 | free_irq(virq, cookie); | 205 | free_irq(virq, cookie); |
| 206 | irq_dispose_mapping(virq); | ||
| 207 | } | 206 | } |
| 208 | 207 | ||
| 209 | int cxl_register_one_irq(struct cxl *adapter, | 208 | int cxl_register_one_irq(struct cxl *adapter, |