From: Rusty Russell Subject: cpumask: get rid of cpumask_t. Very shortly, struct cpumask will be declared but undefined for CONFIG_CPUMASK_OFFSTACK, so use 'struct cpumask' rather than the obsolescent 'cpumask_t'. Signed-off-by: Rusty Russell --- include/linux/interrupt.h | 2 +- include/linux/mm_types.h | 2 +- lib/cpu_rmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -269,7 +269,7 @@ struct irq_affinity_notify { unsigned int irq; struct kref kref; struct work_struct work; - void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); + void (*notify)(struct irq_affinity_notify *, const struct cpumask *mask); void (*release)(struct kref *ref); }; diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -399,7 +399,7 @@ static inline void mm_init_cpumask(struc } /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -static inline cpumask_t *mm_cpumask(struct mm_struct *mm) +static inline struct cpumask *mm_cpumask(struct mm_struct *mm) { return mm->cpu_vm_mask_var; } diff --git a/lib/cpu_rmap.c b/lib/cpu_rmap.c --- a/lib/cpu_rmap.c +++ b/lib/cpu_rmap.c @@ -219,7 +219,7 @@ void free_irq_cpu_rmap(struct cpu_rmap * EXPORT_SYMBOL(free_irq_cpu_rmap); static void -irq_cpu_rmap_notify(struct irq_affinity_notify *notify, const cpumask_t *mask) +irq_cpu_rmap_notify(struct irq_affinity_notify *notify, const struct cpumask *mask) { struct irq_glue *glue = container_of(notify, struct irq_glue, notify);