leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRIS: Don't use mask_irq as symbol name

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

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson 2010-05-25 17:48:14 +02:00
parent 392ed65526
commit 4150764fbb
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/cris/arch-v10/kernel/irq.c
View File

@ -17,8 +17,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); #define crisv10_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_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 /* don't use set_int_vector, it bypasses the linux interrupt handlers. it is
* global just so that the kernel gdb can use it. * 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) static void enable_crisv10_irq(unsigned int irq)
{ {
unmask_irq(irq); crisv10_unmask_irq(irq);
} }
static void disable_crisv10_irq(unsigned int irq) static void disable_crisv10_irq(unsigned int irq)
{ {
mask_irq(irq); crisv10_mask_irq(irq);
} }
static void ack_crisv10_irq(unsigned int irq) static void ack_crisv10_irq(unsigned int irq)

4
arch/cris/arch-v32/kernel/crisksyms.c
View File

@ -24,5 +24,5 @@ EXPORT_SYMBOL(crisv32_io_get_name);
EXPORT_SYMBOL(crisv32_io_get); EXPORT_SYMBOL(crisv32_io_get);
/* Functions masking/unmasking interrupts */ /* Functions masking/unmasking interrupts */
EXPORT_SYMBOL(mask_irq); EXPORT_SYMBOL(crisv32_mask_irq);
EXPORT_SYMBOL(unmask_irq); EXPORT_SYMBOL(crisv32_unmask_irq);

14
arch/cris/arch-v32/kernel/irq.c
View File

@ -280,8 +280,7 @@ out:
return cpu; return cpu;
} }
void void crisv32_mask_irq(int irq)
mask_irq(int irq)
{ {
int cpu; int cpu;
@ -289,8 +288,7 @@ mask_irq(int irq)
block_irq(irq, cpu); block_irq(irq, cpu);
} }
void void crisv32_unmask_irq(int irq)
unmask_irq(int irq)
{ {
unblock_irq(irq, irq_cpu(irq)); unblock_irq(irq, irq_cpu(irq));
} }
@ -298,23 +296,23 @@ unmask_irq(int irq)
static unsigned int startup_crisv32_irq(unsigned int irq) static unsigned int startup_crisv32_irq(unsigned int irq)
{ {
unmask_irq(irq); crisv32_unmask_irq(irq);
return 0; return 0;
} }
static void shutdown_crisv32_irq(unsigned int irq) static void shutdown_crisv32_irq(unsigned int irq)
{ {
mask_irq(irq); crisv32_mask_irq(irq);
} }
static void enable_crisv32_irq(unsigned int irq) static void enable_crisv32_irq(unsigned int irq)
{ {
unmask_irq(irq); crisv32_unmask_irq(irq);
} }
static void disable_crisv32_irq(unsigned int irq) static void disable_crisv32_irq(unsigned int irq)
{ {
mask_irq(irq); crisv32_mask_irq(irq);
} }
static void ack_crisv32_irq(unsigned int irq) static void ack_crisv32_irq(unsigned int irq)

4
arch/cris/arch-v32/kernel/smp.c
View File

@ -168,8 +168,8 @@ void __init smp_callin(void)
/* Enable IRQ and idle */ /* Enable IRQ and idle */
REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask); REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask);
unmask_irq(IPI_INTR_VECT); crisv32_unmask_irq(IPI_INTR_VECT);
unmask_irq(TIMER0_INTR_VECT); crisv32_unmask_irq(TIMER0_INTR_VECT);
preempt_disable(); preempt_disable();
notify_cpu_starting(cpu); notify_cpu_starting(cpu);
local_irq_enable(); local_irq_enable();

9
arch/cris/include/arch-v10/arch/irq.h
View File

@ -93,15 +93,16 @@ void set_break_vector(int n, irqvectptr addr);
"push $r10\n\t" /* push orig_r10 */ \ "push $r10\n\t" /* push orig_r10 */ \
"clear.d [$sp=$sp-4]\n\t" /* frametype - this is a normal stackframe */ "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) \ #define BLOCK_IRQ(mask,nr) \
"move.d " #mask ",$r0\n\t" \ "move.d " #mask ",$r0\n\t" \
"move.d $r0,[0xb00000d8]\n\t" "move.d $r0,[0xb00000d8]\n\t"
#define UNBLOCK_IRQ(mask) \ #define UNBLOCK_IRQ(mask) \
"move.d " #mask ",$r0\n\t" \ "move.d " #mask ",$r0\n\t" \
"move.d $r0,[0xb00000dc]\n\t" "move.d $r0,[0xb00000dc]\n\t"
#define IRQ_NAME2(nr) nr##_interrupt(void) #define IRQ_NAME2(nr) nr##_interrupt(void)
#define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)

4
arch/cris/include/arch-v32/arch/irq.h
View File

@ -23,8 +23,8 @@ struct etrax_interrupt_vector {
extern struct etrax_interrupt_vector *etrax_irv; /* head.S */ extern struct etrax_interrupt_vector *etrax_irv; /* head.S */
void mask_irq(int irq); void crisv32_mask_irq(int irq);
void unmask_irq(int irq); void crisv32_unmask_irq(int irq);
void set_exception_vector(int n, irqvectptr addr); void set_exception_vector(int n, irqvectptr addr);