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

Commit b08b5c9c authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: handle leon in irq_32.c 



Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
parent 5b8b93c4

arch/sparc/kernel/irq_32.c

+12 −10
Original line number Diff line number Diff line
@@ -241,9 +241,6 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler) 
	unsigned int cpu_irq;

	int err;



#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON

	struct tt_entry *trap_table;

#endif



	err = request_irq(irq, irq_handler, 0, "floppy", NULL);

	if (err)
@@ -264,13 +261,18 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler) 
	table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;



	INSTANTIATE(sparc_ttable)

#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON



#if defined CONFIG_SMP

	if (sparc_cpu_model != sparc_leon) {

		struct tt_entry *trap_table;



		trap_table = &trapbase_cpu1;

		INSTANTIATE(trap_table)

		trap_table = &trapbase_cpu2;

		INSTANTIATE(trap_table)

		trap_table = &trapbase_cpu3;

		INSTANTIATE(trap_table)

	}

#endif

#undef INSTANTIATE

	/*