diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
| commit | f05218651be1ac6a6088e226bd7350fb6c154414 (patch) | |
| tree | 204ee38c859f08e7e76ea4b6913cdea52cb25d56 /kernel/irq/irqdomain.c | |
| parent | irqchip: atmel-aic5: Add sama5d2 support (diff) | |
| parent | genirq: Remove bogus restriction in irq_move_mask_irq() (diff) | |
| download | linux-dev-f05218651be1ac6a6088e226bd7350fb6c154414.tar.xz linux-dev-f05218651be1ac6a6088e226bd7350fb6c154414.zip | |
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.c | 4 |
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; } |