[ARM] Fix circular include dependency with IRQ headers (897d8527) · Commits · e / devices / android_kernel_samsung_universal8895

arch/arm/include/asm/hw_irq.h

+19 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,24 @@
		#ifndef _ARCH_ARM_HW_IRQ_H
		#define _ARCH_ARM_HW_IRQ_H

		#include <asm/mach/irq.h>
		static inline void ack_bad_irq(int irq)
		{
		extern unsigned long irq_err_count;
		irq_err_count++;
		}

		/*
		* Obsolete inline function for calling irq descriptor handlers.
		*/
		static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
		{
		desc->handle_irq(irq, desc);
		}

		void set_irq_flags(unsigned int irq, unsigned int flags);

		#define IRQF_VALID (1 << 0)
		#define IRQF_PROBE (1 << 1)
		#define IRQF_NOAUTOEN (1 << 2)

		#endif

+0 −20

Original line number	Diff line number	Diff line
		@@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void);
		extern void init_FIQ(void);
		extern int show_fiq_list(struct seq_file , void );

		/*
		* Obsolete inline function for calling irq descriptor handlers.
		*/
		static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
		{
		desc->handle_irq(irq, desc);
		}

		void set_irq_flags(unsigned int irq, unsigned int flags);

		#define IRQF_VALID (1 << 0)
		#define IRQF_PROBE (1 << 1)
		#define IRQF_NOAUTOEN (1 << 2)

		/*
		* This is for easy migration, but should be changed in the source
		*/
		@@ -45,10 +31,4 @@ do { \
		spin_unlock(&desc->lock); \
		} while(0)

		extern unsigned long irq_err_count;
		static inline void ack_bad_irq(int irq)
		{
		irq_err_count++;
		}

		#endif

+1 −0