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

Commit f30a6484 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/irq: Remove obsolete support for user vector interrupt fixups 



It was used on Apollo only, before its conversion to genirq.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d890d739

arch/m68k/apollo/dn_ints.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct irq_chip apollo_irq_chip = { 


void __init dn_init_IRQ(void)

{

	m68k_setup_user_interrupt(VEC_USER + 96, 16, NULL);

	m68k_setup_user_interrupt(VEC_USER + 96, 16);

	m68k_setup_irq_controller(&apollo_irq_chip, handle_fasteoi_irq,

				  IRQ_APOLLO, 16);

}

arch/m68k/atari/ataints.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct irq_chip atari_irq_chip = { 


void __init atari_init_IRQ(void)

{

	m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL);

	m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER);

	m68k_setup_irq_controller(&atari_irq_chip, handle_simple_irq, 1,

				  NUM_ATARI_SOURCES - 1);

arch/m68k/bvme6000/config.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void bvme6000_get_model(char *model) 
 */

static void __init bvme6000_init_IRQ(void)

{

	m68k_setup_user_interrupt(VEC_USER, 192, NULL);

	m68k_setup_user_interrupt(VEC_USER, 192);

}



void __init config_bvme6000(void)

arch/m68k/include/asm/irq.h

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ extern unsigned int m68k_irq_startup_irq(unsigned int irq); 
extern void m68k_irq_shutdown(struct irq_data *data);

extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int,

						      struct pt_regs *));

extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,

				      void (*handler)(unsigned int,

						      struct pt_regs *));

extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt);

extern void m68k_setup_irq_controller(struct irq_chip *,

				      void (*handle)(unsigned int irq,

						     struct irq_desc *desc),

arch/m68k/kernel/entry_mm.S

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
.globl sys_fork, sys_clone, sys_vfork

.globl ret_from_interrupt, bad_interrupt

.globl auto_irqhandler_fixup

.globl user_irqvec_fixup, user_irqhandler_fixup

.globl user_irqvec_fixup



.text

ENTRY(buserr)
@@ -240,7 +240,6 @@ user_irqvec_fixup = . + 2 


	movel	%sp,%sp@-

	movel	%d0,%sp@-		|  put vector # on stack

user_irqhandler_fixup = . + 2

	jsr	do_IRQ			|  process the IRQ

	addql	#8,%sp			|  pop parameters off stack