aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/numa_migrate.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-01 06:58:38 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-04 06:36:26 -0400
commit6b8ff3120c758340505dddf08ad685ebb841d5d5 (patch)
tree794eed27c6f9a8931b8fdf4a7ae60a1560b237fc /kernel/irq/numa_migrate.c
parentff7dcd44dd446db2c3e13bdedf2d52b8e0127f16 (diff)
genirq: Convert core code to irq_data
Convert all references in the core code to orq, chip, handler_data, chip_data, msi_desc, affinity to irq_data.* Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/numa_migrate.c')
-rw-r--r--kernel/irq/numa_migrate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c
index 65d3845665ac..e7f1f16402c1 100644
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
@@ -44,7 +44,7 @@ static bool init_copy_one_irq_desc(int irq, struct irq_desc *old_desc,
44 return false; 44 return false;
45 } 45 }
46 raw_spin_lock_init(&desc->lock); 46 raw_spin_lock_init(&desc->lock);
47 desc->node = node; 47 desc->irq_data.node = node;
48 lockdep_set_class(&desc->lock, &irq_desc_lock_class); 48 lockdep_set_class(&desc->lock, &irq_desc_lock_class);
49 init_copy_kstat_irqs(old_desc, desc, node, nr_cpu_ids); 49 init_copy_kstat_irqs(old_desc, desc, node, nr_cpu_ids);
50 init_copy_desc_masks(old_desc, desc); 50 init_copy_desc_masks(old_desc, desc);
@@ -66,7 +66,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
66 unsigned int irq; 66 unsigned int irq;
67 unsigned long flags; 67 unsigned long flags;
68 68
69 irq = old_desc->irq; 69 irq = old_desc->irq_data.irq;
70 70
71 raw_spin_lock_irqsave(&sparse_irq_lock, flags); 71 raw_spin_lock_irqsave(&sparse_irq_lock, flags);
72 72
@@ -109,10 +109,10 @@ out_unlock:
109struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) 109struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
110{ 110{
111 /* those static or target node is -1, do not move them */ 111 /* those static or target node is -1, do not move them */
112 if (desc->irq < NR_IRQS_LEGACY || node == -1) 112 if (desc->irq_data.irq < NR_IRQS_LEGACY || node == -1)
113 return desc; 113 return desc;
114 114
115 if (desc->node != node) 115 if (desc->irq_data.node != node)
116 desc = __real_move_irq_desc(desc, node); 116 desc = __real_move_irq_desc(desc, node);
117 117
118 return desc; 118 return desc;