| Message ID | 75bbcdd1e9277d66ebb06e349dda304bd01ce761.1543957194.git.christophe.leroy@c-s.fr |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] mips/kgdb: prepare arch_kgdb_ops for constness | expand |
On Wed, Dec 05, 2018 at 04:41:09AM +0000, Christophe Leroy wrote: > MIPS is the only architecture modifying arch_kgdb_ops during init. > This patch makes the init static, so that it can be changed to > const in following patch, as recommended by checkpatch.pl > > Suggested-by: Paul Burton <paul.burton@mips.com> > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> From my side this is Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Since this is a dependency for the next patch I'd be happy to take via my tree... but would need an ack from the MIPS guys to do that. Daniel. > --- > arch/mips/kernel/kgdb.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c > index eb6c0d582626..31eff1bec577 100644 > --- a/arch/mips/kernel/kgdb.c > +++ b/arch/mips/kernel/kgdb.c > @@ -394,18 +394,16 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, > return -1; > } > > -struct kgdb_arch arch_kgdb_ops; > +struct kgdb_arch arch_kgdb_ops = { > +#ifdef CONFIG_CPU_BIG_ENDIAN > + .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, > +#else > + .gdb_bpt_instr = { break_op, 0x00, 0x00, spec_op << 2 }, > +#endif > +}; > > int kgdb_arch_init(void) > { > - union mips_instruction insn = { > - .r_format = { > - .opcode = spec_op, > - .func = break_op, > - } > - }; > - memcpy(arch_kgdb_ops.gdb_bpt_instr, insn.byte, BREAK_INSTR_SIZE); > - > register_die_notifier(&kgdb_notifier); > > return 0; > -- > 2.13.3 >
Hi Christophe & Daniel, On Thu, Dec 06, 2018 at 02:09:02PM +0000, Daniel Thompson wrote: > On Wed, Dec 05, 2018 at 04:41:09AM +0000, Christophe Leroy wrote: > > MIPS is the only architecture modifying arch_kgdb_ops during init. > > This patch makes the init static, so that it can be changed to > > const in following patch, as recommended by checkpatch.pl > > > > Suggested-by: Paul Burton <paul.burton@mips.com> > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > From my side this is > Acked-by: Daniel Thompson <daniel.thompson@linaro.org> > > Since this is a dependency for the next patch I'd be happy to take via > my tree... but would need an ack from the MIPS guys to do that. For both patches in this series: Acked-by: Paul Burton <paul.burton@mips.com> Thanks, Paul
Le 06/12/2018 à 15:09, Daniel Thompson a écrit : > On Wed, Dec 05, 2018 at 04:41:09AM +0000, Christophe Leroy wrote: >> MIPS is the only architecture modifying arch_kgdb_ops during init. >> This patch makes the init static, so that it can be changed to >> const in following patch, as recommended by checkpatch.pl >> >> Suggested-by: Paul Burton <paul.burton@mips.com> >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > From my side this is > Acked-by: Daniel Thompson <daniel.thompson@linaro.org> > > Since this is a dependency for the next patch I'd be happy to take via > my tree... but would need an ack from the MIPS guys to do that. Got an ack from MIPS: Acked-by: Paul Burton <paul.burton@mips.com> Included in commit text v2 Christophe > > > Daniel. > >> --- >> arch/mips/kernel/kgdb.c | 16 +++++++--------- >> 1 file changed, 7 insertions(+), 9 deletions(-) >> >> diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c >> index eb6c0d582626..31eff1bec577 100644 >> --- a/arch/mips/kernel/kgdb.c >> +++ b/arch/mips/kernel/kgdb.c >> @@ -394,18 +394,16 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, >> return -1; >> } >> >> -struct kgdb_arch arch_kgdb_ops; >> +struct kgdb_arch arch_kgdb_ops = { >> +#ifdef CONFIG_CPU_BIG_ENDIAN >> + .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, >> +#else >> + .gdb_bpt_instr = { break_op, 0x00, 0x00, spec_op << 2 }, >> +#endif >> +}; >> >> int kgdb_arch_init(void) >> { >> - union mips_instruction insn = { >> - .r_format = { >> - .opcode = spec_op, >> - .func = break_op, >> - } >> - }; >> - memcpy(arch_kgdb_ops.gdb_bpt_instr, insn.byte, BREAK_INSTR_SIZE); >> - >> register_die_notifier(&kgdb_notifier); >> >> return 0; >> -- >> 2.13.3 >>
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index eb6c0d582626..31eff1bec577 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c @@ -394,18 +394,16 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, return -1; } -struct kgdb_arch arch_kgdb_ops; +struct kgdb_arch arch_kgdb_ops = { +#ifdef CONFIG_CPU_BIG_ENDIAN + .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, +#else + .gdb_bpt_instr = { break_op, 0x00, 0x00, spec_op << 2 }, +#endif +}; int kgdb_arch_init(void) { - union mips_instruction insn = { - .r_format = { - .opcode = spec_op, - .func = break_op, - } - }; - memcpy(arch_kgdb_ops.gdb_bpt_instr, insn.byte, BREAK_INSTR_SIZE); - register_die_notifier(&kgdb_notifier); return 0;
MIPS is the only architecture modifying arch_kgdb_ops during init. This patch makes the init static, so that it can be changed to const in following patch, as recommended by checkpatch.pl Suggested-by: Paul Burton <paul.burton@mips.com> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/mips/kernel/kgdb.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)