projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
[cascardo/linux.git]
/
arch
/
powerpc
/
sysdev
/
xics
/
ics-rtas.c
diff --git
a/arch/powerpc/sysdev/xics/ics-rtas.c
b/arch/powerpc/sysdev/xics/ics-rtas.c
index
936575d
..
bc81335
100644
(file)
--- a/
arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/
arch/powerpc/sysdev/xics/ics-rtas.c
@@
-76,7
+76,7
@@
static unsigned int ics_rtas_startup(struct irq_data *d)
* at that level, so we do it here by hand.
*/
if (d->msi_desc)
-
unmask_msi
_irq(d);
+
pci_msi_unmask
_irq(d);
#endif
/* unmask it */
ics_rtas_unmask_irq(d);