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
/
i8259.c
diff --git
a/kernel/arch/powerpc/sysdev/i8259.c
b/kernel/arch/powerpc/sysdev/i8259.c
index
45598da
..
6f99ed3
100644
(file)
--- a/
kernel/arch/powerpc/sysdev/i8259.c
+++ b/
kernel/arch/powerpc/sysdev/i8259.c
@@
-162,9
+162,11
@@
static struct resource pic_edgectrl_iores = {
.flags = IORESOURCE_BUSY,
};
.flags = IORESOURCE_BUSY,
};
-static int i8259_host_match(struct irq_domain *h, struct device_node *node)
+static int i8259_host_match(struct irq_domain *h, struct device_node *node,
+ enum irq_domain_bus_token bus_token)
{
{
- return h->of_node == NULL || h->of_node == node;
+ struct device_node *of_node = irq_domain_get_of_node(h);
+ return of_node == NULL || of_node == node;
}
static int i8259_host_map(struct irq_domain *h, unsigned int virq,
}
static int i8259_host_map(struct irq_domain *h, unsigned int virq,
@@
-204,7
+206,7
@@
static int i8259_host_xlate(struct irq_domain *h, struct device_node *ct,
return 0;
}
return 0;
}
-static struct irq_domain_ops i8259_host_ops = {
+static
const
struct irq_domain_ops i8259_host_ops = {
.match = i8259_host_match,
.map = i8259_host_map,
.xlate = i8259_host_xlate,
.match = i8259_host_match,
.map = i8259_host_map,
.xlate = i8259_host_xlate,