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

Commit 4150764f authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

CRIS: Don't use mask_irq as symbol name 



kernel/irq/chip.c now uses these, which lead to compile error
for CRISv32.

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 392ed655

arch/cris/arch-v10/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <linux/kernel.h>

#include <linux/init.h>



#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));

#define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));

#define crisv10_mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));

#define crisv10_unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));



/* don't use set_int_vector, it bypasses the linux interrupt handlers. it is

 * global just so that the kernel gdb can use it.
@@ -116,12 +116,12 @@ static unsigned int startup_crisv10_irq(unsigned int irq) 


static void enable_crisv10_irq(unsigned int irq)

{

	unmask_irq(irq);

	crisv10_unmask_irq(irq);

}



static void disable_crisv10_irq(unsigned int irq)

{

	mask_irq(irq);

	crisv10_mask_irq(irq);

}



static void ack_crisv10_irq(unsigned int irq)

arch/cris/arch-v32/kernel/crisksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ EXPORT_SYMBOL(crisv32_io_get_name); 
EXPORT_SYMBOL(crisv32_io_get);



/* Functions masking/unmasking interrupts */

EXPORT_SYMBOL(mask_irq);

EXPORT_SYMBOL(unmask_irq);
 
EXPORT_SYMBOL(crisv32_mask_irq);

EXPORT_SYMBOL(crisv32_unmask_irq);

arch/cris/arch-v32/kernel/irq.c

+6 −8
Original line number Diff line number Diff line
@@ -280,8 +280,7 @@ out: 
	return cpu;

}



void

mask_irq(int irq)

void crisv32_mask_irq(int irq)

{

	int cpu;
@@ -289,8 +288,7 @@ mask_irq(int irq) 
		block_irq(irq, cpu);

}



void

unmask_irq(int irq)

void crisv32_unmask_irq(int irq)

{

	unblock_irq(irq, irq_cpu(irq));

}
@@ -298,23 +296,23 @@ unmask_irq(int irq) 


static unsigned int startup_crisv32_irq(unsigned int irq)

{

	unmask_irq(irq);

	crisv32_unmask_irq(irq);

	return 0;

}



static void shutdown_crisv32_irq(unsigned int irq)

{

	mask_irq(irq);

	crisv32_mask_irq(irq);

}



static void enable_crisv32_irq(unsigned int irq)

{

	unmask_irq(irq);

	crisv32_unmask_irq(irq);

}



static void disable_crisv32_irq(unsigned int irq)

{

	mask_irq(irq);

	crisv32_mask_irq(irq);

}



static void ack_crisv32_irq(unsigned int irq)

arch/cris/arch-v32/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -168,8 +168,8 @@ void __init smp_callin(void) 


	/* Enable IRQ and idle */

	REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask);

	unmask_irq(IPI_INTR_VECT);

	unmask_irq(TIMER0_INTR_VECT);

	crisv32_unmask_irq(IPI_INTR_VECT);

	crisv32_unmask_irq(TIMER0_INTR_VECT);

	preempt_disable();

	notify_cpu_starting(cpu);

	local_irq_enable();

arch/cris/include/arch-v10/arch/irq.h

+5 −4
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ void set_break_vector(int n, irqvectptr addr); 
  "push $r10\n\t"       /* push orig_r10 */ \

  "clear.d [$sp=$sp-4]\n\t"  /* frametype - this is a normal stackframe */



  /* BLOCK_IRQ and UNBLOCK_IRQ do the same as mask_irq and unmask_irq */

/* BLOCK_IRQ and UNBLOCK_IRQ do the same as

 * crisv10_mask_irq and crisv10_unmask_irq */



#define BLOCK_IRQ(mask,nr) \

  "move.d " #mask ",$r0\n\t" \