MIPS: msp71xx: fix msp_time build error
PATCH 1/2 MIPS: msp71xx: fix msp_time build error
In file included from arch/mips/pmc-sierra/msp71xx/msp_time.c:32:0:/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:21:56: error: 'enum clock_event_mode' declared inside parameter list /home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:21:56: error: its scope is only this definition or declaration, which is probably not what you want /home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h: In function 'handle_perf_irq':/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:42:3: error: implicit declaration of function 'perf_irq'
In file included from arch/mips/pmc-sierra/msp71xx/msp_time.c:34:0:/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/time.h: At top level:/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/time.h:48:14: error: 'perf_irq' redeclared as different kind of symbol /home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:42:3: note: previous implicit declaration of 'perf_irq' was here make[2]: *** [arch/mips/pmc-sierra/msp71xx/msp_time.o] Error 1
--- arch/mips/pmc-sierra/msp71xx/msp_time.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/mips/pmc-sierra/msp71xx/msp_time.c +2 -1
@@ -28,10 +28,11 @@#include <linux/spinlock.h> #include <linux/module.h> #include <linux/ptrace.h> +#include <linux/clockchips.h> +#include <asm/time.h> #include <asm/cevt-r4k.h> #include <asm/mipsregs.h> -#include <asm/time.h> #include <msp_prom.h> #include <msp_int.h>
Signature · 1 line
1.7.3.4
PATCH 2/2 MIPS: msp71xx: fix typo in msp_per_irq_controller
CC arch/mips/pmc-sierra/msp71xx/msp_irq_per.oarch/mips/pmc-sierra/msp71xx/msp_irq_per.c:101:2: error: expected identifier before '.' token make[2]: *** [arch/mips/pmc-sierra/msp71xx/msp_irq_per.o] Error 1
--- arch/mips/pmc-sierra/msp71xx/msp_irq_per.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/pmc-sierra/msp71xx/msp_irq_per.c +1 -1
@@ -97,7 +97,7 @@ static int msp_per_irq_set_affinity(struct irq_data *d,static struct irq_chip msp_per_irq_controller = { .name ="MSP_PER" , - .irq_enable = unmask_per_irq. + .irq_enable = unmask_per_irq, .irq_disable = mask_per_irq, .irq_ack = msp_per_irq_ack, #ifdef CONFIG_SMP
Signature · 1 line
1.7.3.4
Ralf Baechle
AppliedRe: [PATCH 2/2] MIPS: msp71xx: fix typo in msp_per_irq_controller
Applied. Thanks, Yoichi-San,
Ralf
Quoted 7 lines · Yoichi Yuasa
arch/mips/pmc-sierra/msp71xx/msp_time.c +0
-0@@ -28,10 +28,11 @@#include <linux/spinlock.h> #include <linux/module.h>
arch/mips/pmc-sierra/msp71xx/msp_time.c line 38
Quoted 10 lines
arch/mips/pmc-sierra/msp71xx/msp_time.c +2
-1#include <linux/ptrace.h> +#include <linux/clockchips.h> +#include <asm/time.h> #include <asm/cevt-r4k.h> #include <asm/mipsregs.h> -#include <asm/time.h> #include <msp_prom.h> #include <msp_int.h>
I went for a different patch. Thanks Yoichi-San!
Ralf