summaryrefslogtreecommitdiff
path: root/kernel/irq/irqdomain.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-20 19:14:31 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-06-20 19:14:31 +0200
commitf05218651be1ac6a6088e226bd7350fb6c154414 (patch)
tree204ee38c859f08e7e76ea4b6913cdea52cb25d56 /kernel/irq/irqdomain.c
parent62a993df31f795d87bcb4c6cb005d36f32f6ad55 (diff)
parenta614a610ac9b28f195d790d25be72d26f345c53a (diff)
Merge branch 'irq/for-x86' into irq/core
Get the infrastructure patches which are required for x86/apic into core
Diffstat (limited to 'kernel/irq/irqdomain.c')
-rw-r--r--kernel/irq/irqdomain.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 41bf6dc49f59..8c3577fef78c 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -830,10 +830,12 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain,
{
struct irq_data *irq_data;
- irq_data = kzalloc_node(sizeof(*irq_data), GFP_KERNEL, child->node);
+ irq_data = kzalloc_node(sizeof(*irq_data), GFP_KERNEL,
+ irq_data_get_node(child));
if (irq_data) {
child->parent_data = irq_data;
irq_data->irq = child->irq;
+ irq_data->common = child->common;
irq_data->node = child->node;
irq_data->domain = domain;
}