Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a19ebc authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Fix CONFIG_GENIRQ_NO_DEPRECATED=y build 



This option can be set to verify the full conversion to the new chip
functions. Fix the fallout of the patch rework, so the core code
compiles and works with it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2ee39065

kernel/irq/dummychip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static unsigned int noop_ret(struct irq_data *data) 
	return 0;

	return 0;

}

}





#ifndef CONFIG_GENERIC_HARDIRQS_NO_CRUFT

#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED

static void compat_noop(unsigned int irq) { }

static void compat_noop(unsigned int irq) { }

#define END_INIT .end = compat_noop

#define END_INIT .end = compat_noop

#else

#else

kernel/irq/irqdesc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static void free_masks(struct irq_desc *desc) 
#ifdef CONFIG_GENERIC_PENDING_IRQ

#ifdef CONFIG_GENERIC_PENDING_IRQ

	free_cpumask_var(desc->pending_mask);

	free_cpumask_var(desc->pending_mask);

#endif

#endif

	free_cpumask_var(desc->affinity);

	free_cpumask_var(desc->irq_data.affinity);

}

}

#else

#else

static inline void free_masks(struct irq_desc *desc) { }

static inline void free_masks(struct irq_desc *desc) { }