Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
powerpc
/
sysdev
/
xics
/
xics-common.c
diff --git
a/kernel/arch/powerpc/sysdev/xics/xics-common.c
b/kernel/arch/powerpc/sysdev/xics/xics-common.c
index
878a540
..
47e43b7
100644
(file)
--- a/
kernel/arch/powerpc/sysdev/xics/xics-common.c
+++ b/
kernel/arch/powerpc/sysdev/xics/xics-common.c
@@
-227,7
+227,7
@@
void xics_migrate_irqs_away(void)
/* Locate interrupt server */
server = -1;
/* Locate interrupt server */
server = -1;
- ics = irq_
get_chip_data(virq
);
+ ics = irq_
desc_get_chip_data(desc
);
if (ics)
server = ics->get_server(ics, irq);
if (server < 0) {
if (ics)
server = ics->get_server(ics, irq);
if (server < 0) {
@@
-298,7
+298,8
@@
int xics_get_irq_server(unsigned int virq, const struct cpumask *cpumask,
}
#endif /* CONFIG_SMP */
}
#endif /* CONFIG_SMP */
-static int xics_host_match(struct irq_domain *h, struct device_node *node)
+static int xics_host_match(struct irq_domain *h, struct device_node *node,
+ enum irq_domain_bus_token bus_token)
{
struct ics *ics;
{
struct ics *ics;
@@
-360,7
+361,7
@@
static int xics_host_xlate(struct irq_domain *h, struct device_node *ct,
return 0;
}
return 0;
}
-static struct irq_domain_ops xics_host_ops = {
+static
const
struct irq_domain_ops xics_host_ops = {
.match = xics_host_match,
.map = xics_host_map,
.xlate = xics_host_xlate,
.match = xics_host_match,
.map = xics_host_map,
.xlate = xics_host_xlate,