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

Commit e9ed7e72 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

take declarations of enable_irq() et.al. to linux/interrupt.h 



Now that the last inlined instances are gone, all that is left to do
is turning disable_irq_nosync on arm26 and m68k from defines to aliases
and we are all set - we can make these externs in linux/interrupt.h
uncoditional and kill remaining instances in asm/irq.h

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6f194d8

arch/arm26/kernel/armksyms.c

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ EXPORT_SYMBOL(__bug); 
#endif

EXPORT_SYMBOL(__bad_xchg);

EXPORT_SYMBOL(__readwrite_bug);

EXPORT_SYMBOL(enable_irq);

EXPORT_SYMBOL(disable_irq);

EXPORT_SYMBOL(set_irq_type);

EXPORT_SYMBOL(pm_idle);

EXPORT_SYMBOL(pm_power_off);

arch/arm26/kernel/irq.c

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ void disable_irq(unsigned int irq) 
		desc->enabled = 0;

	spin_unlock_irqrestore(&irq_controller_lock, flags);

}

EXPORT_SYMBOL(disable_irq);



void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));



EXPORT_SYMBOL(disable_irq_nosync);



/**

 *	enable_irq - enable interrupt handling on an irq
@@ -131,6 +136,7 @@ void enable_irq(unsigned int irq) 
	}

	spin_unlock_irqrestore(&irq_controller_lock, flags);

}

EXPORT_SYMBOL(enable_irq);



int show_interrupts(struct seq_file *p, void *v)

{

arch/m68k/kernel/ints.c

+4 −0
Original line number Diff line number Diff line
@@ -326,6 +326,10 @@ void disable_irq(unsigned int irq) 


EXPORT_SYMBOL(disable_irq);



void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));



EXPORT_SYMBOL(disable_irq_nosync);



int m68k_irq_startup(unsigned int irq)

{

	if (irq <= IRQ_AUTO_7)

include/asm-alpha/irq.h

+0 −4
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ static __inline__ int irq_canonicalize(int irq) 
	return ((irq == 2) ? 9 : irq);

}



extern void disable_irq(unsigned int);

extern void disable_irq_nosync(unsigned int);

extern void enable_irq(unsigned int);



struct pt_regs;

extern void (*perf_irq)(unsigned long, struct pt_regs *);

include/asm-arm26/irq.h

+0 −5
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 


struct irqaction;



#define disable_irq_nosync(i) disable_irq(i)



extern void disable_irq(unsigned int);

extern void enable_irq(unsigned int);



#define __IRQT_FALEDGE	(1 << 0)

#define __IRQT_RISEDGE	(1 << 1)

#define __IRQT_LOWLVL	(1 << 2)