| Message ID | 6b1a19ffa0da02cff9b82b866ba31d57478501ce.1543957194.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] mips/kgdb: prepare arch_kgdb_ops for constness | expand |
On Wed, Dec 05, 2018 at 04:41:11AM +0000, Christophe Leroy wrote: > checkpatch.pl reports the following: > > WARNING: struct kgdb_arch should normally be const > #28: FILE: arch/mips/kernel/kgdb.c:397: > +struct kgdb_arch arch_kgdb_ops = { > > This report makes sense, as all other ops struct, this > one should also be const. This patch does the change. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Similar to https://patchwork.kernel.org/patch/10701129/ I would be more comfortable to see a resend with the relevant arch maintainers explicitly called out with a Cc: entry here. > --- > arch/arc/kernel/kgdb.c | 2 +- > arch/arm/kernel/kgdb.c | 2 +- > arch/arm64/kernel/kgdb.c | 2 +- > arch/h8300/kernel/kgdb.c | 2 +- > arch/hexagon/kernel/kgdb.c | 2 +- > arch/microblaze/kernel/kgdb.c | 2 +- > arch/mips/kernel/kgdb.c | 2 +- > arch/nios2/kernel/kgdb.c | 2 +- > arch/powerpc/kernel/kgdb.c | 2 +- > arch/sh/kernel/kgdb.c | 2 +- > arch/sparc/kernel/kgdb_32.c | 2 +- > arch/sparc/kernel/kgdb_64.c | 2 +- > arch/x86/kernel/kgdb.c | 2 +- > include/linux/kgdb.h | 2 +- > 14 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/arc/kernel/kgdb.c b/arch/arc/kernel/kgdb.c > index 9a3c34af2ae8..bfd04b442e36 100644 > --- a/arch/arc/kernel/kgdb.c > +++ b/arch/arc/kernel/kgdb.c > @@ -204,7 +204,7 @@ void kgdb_roundup_cpus(unsigned long flags) > local_irq_disable(); > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* breakpoint instruction: TRAP_S 0x3 */ > #ifdef CONFIG_CPU_BIG_ENDIAN > .gdb_bpt_instr = {0x78, 0x7e}, > diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c > index caa0dbe3dc61..21a6d5958955 100644 > --- a/arch/arm/kernel/kgdb.c > +++ b/arch/arm/kernel/kgdb.c > @@ -274,7 +274,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) > * and we handle the normal undef case within the do_undefinstr > * handler. > */ > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > #ifndef __ARMEB__ > .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} > #else /* ! __ARMEB__ */ > diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c > index a20de58061a8..fe1d1f935b90 100644 > --- a/arch/arm64/kernel/kgdb.c > +++ b/arch/arm64/kernel/kgdb.c > @@ -357,7 +357,7 @@ void kgdb_arch_exit(void) > unregister_die_notifier(&kgdb_notifier); > } > > -struct kgdb_arch arch_kgdb_ops; > +const struct kgdb_arch arch_kgdb_ops; > > int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) > { > diff --git a/arch/h8300/kernel/kgdb.c b/arch/h8300/kernel/kgdb.c > index 1a1d30cb0609..602e478afbd5 100644 > --- a/arch/h8300/kernel/kgdb.c > +++ b/arch/h8300/kernel/kgdb.c > @@ -129,7 +129,7 @@ void kgdb_arch_exit(void) > /* Nothing to do */ > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: trapa #2 */ > .gdb_bpt_instr = { 0x57, 0x20 }, > }; > diff --git a/arch/hexagon/kernel/kgdb.c b/arch/hexagon/kernel/kgdb.c > index 16c24b22d0b2..f1924d483e78 100644 > --- a/arch/hexagon/kernel/kgdb.c > +++ b/arch/hexagon/kernel/kgdb.c > @@ -83,7 +83,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { > { "syscall_nr", GDB_SIZEOF_REG, offsetof(struct pt_regs, syscall_nr)}, > }; > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* trap0(#0xDB) 0x0cdb0054 */ > .gdb_bpt_instr = {0x54, 0x00, 0xdb, 0x0c}, > }; > diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c > index 6366f69d118e..130cd0f064ce 100644 > --- a/arch/microblaze/kernel/kgdb.c > +++ b/arch/microblaze/kernel/kgdb.c > @@ -143,7 +143,7 @@ void kgdb_arch_exit(void) > /* > * Global data > */ > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > #ifdef __MICROBLAZEEL__ > .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ > #else > diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c > index 31eff1bec577..edfdc2ec2d16 100644 > --- a/arch/mips/kernel/kgdb.c > +++ b/arch/mips/kernel/kgdb.c > @@ -394,7 +394,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, > return -1; > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > #ifdef CONFIG_CPU_BIG_ENDIAN > .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, > #else > diff --git a/arch/nios2/kernel/kgdb.c b/arch/nios2/kernel/kgdb.c > index 117859122d1c..37b25f844a2d 100644 > --- a/arch/nios2/kernel/kgdb.c > +++ b/arch/nios2/kernel/kgdb.c > @@ -165,7 +165,7 @@ void kgdb_arch_exit(void) > /* Nothing to do */ > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: trap 30 */ > .gdb_bpt_instr = { 0xba, 0x6f, 0x3b, 0x00 }, > }; > diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c > index 59c578f865aa..bdb588b1d8fb 100644 > --- a/arch/powerpc/kernel/kgdb.c > +++ b/arch/powerpc/kernel/kgdb.c > @@ -477,7 +477,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) > /* > * Global data > */ > -struct kgdb_arch arch_kgdb_ops; > +const struct kgdb_arch arch_kgdb_ops; > > static int kgdb_not_implemented(struct pt_regs *regs) > { > diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c > index 4f04c6638a4d..a24c48446e98 100644 > --- a/arch/sh/kernel/kgdb.c > +++ b/arch/sh/kernel/kgdb.c > @@ -382,7 +382,7 @@ void kgdb_arch_exit(void) > unregister_die_notifier(&kgdb_notifier); > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: trapa #0x3c */ > #ifdef CONFIG_CPU_LITTLE_ENDIAN > .gdb_bpt_instr = { 0x3c, 0xc3 }, > diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c > index 639c8e54530a..7580775a14b9 100644 > --- a/arch/sparc/kernel/kgdb_32.c > +++ b/arch/sparc/kernel/kgdb_32.c > @@ -166,7 +166,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) > regs->npc = regs->pc + 4; > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: ta 0x7d */ > .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, > }; > diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c > index a68bbddbdba4..5d6c2d287e85 100644 > --- a/arch/sparc/kernel/kgdb_64.c > +++ b/arch/sparc/kernel/kgdb_64.c > @@ -195,7 +195,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) > regs->tnpc = regs->tpc + 4; > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: ta 0x72 */ > .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, > }; > diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c > index 8e36f249646e..e7effc02f13c 100644 > --- a/arch/x86/kernel/kgdb.c > +++ b/arch/x86/kernel/kgdb.c > @@ -804,7 +804,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) > (char *)bpt->saved_instr, BREAK_INSTR_SIZE); > } > > -struct kgdb_arch arch_kgdb_ops = { > +const struct kgdb_arch arch_kgdb_ops = { > /* Breakpoint instruction: */ > .gdb_bpt_instr = { 0xcc }, > .flags = KGDB_HW_BREAKPOINT, > diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h > index e465bb15912d..3bf313311cca 100644 > --- a/include/linux/kgdb.h > +++ b/include/linux/kgdb.h > @@ -281,7 +281,7 @@ struct kgdb_io { > int is_console; > }; > > -extern struct kgdb_arch arch_kgdb_ops; > +extern const struct kgdb_arch arch_kgdb_ops; > > extern unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs); > > -- > 2.13.3 >
Le 06/12/2018 à 15:07, Daniel Thompson a écrit : > On Wed, Dec 05, 2018 at 04:41:11AM +0000, Christophe Leroy wrote: >> checkpatch.pl reports the following: >> >> WARNING: struct kgdb_arch should normally be const >> #28: FILE: arch/mips/kernel/kgdb.c:397: >> +struct kgdb_arch arch_kgdb_ops = { >> >> This report makes sense, as all other ops struct, this >> one should also be const. This patch does the change. >> >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > Acked-by: Daniel Thompson <daniel.thompson@linaro.org> > > Similar to https://patchwork.kernel.org/patch/10701129/ I would be more > comfortable to see a resend with the relevant arch maintainers > explicitly called out with a Cc: entry here. Done in v2 And Acked-by: Paul Burton <paul.burton@mips.com> Thanks Christophe > > >> --- >> arch/arc/kernel/kgdb.c | 2 +- >> arch/arm/kernel/kgdb.c | 2 +- >> arch/arm64/kernel/kgdb.c | 2 +- >> arch/h8300/kernel/kgdb.c | 2 +- >> arch/hexagon/kernel/kgdb.c | 2 +- >> arch/microblaze/kernel/kgdb.c | 2 +- >> arch/mips/kernel/kgdb.c | 2 +- >> arch/nios2/kernel/kgdb.c | 2 +- >> arch/powerpc/kernel/kgdb.c | 2 +- >> arch/sh/kernel/kgdb.c | 2 +- >> arch/sparc/kernel/kgdb_32.c | 2 +- >> arch/sparc/kernel/kgdb_64.c | 2 +- >> arch/x86/kernel/kgdb.c | 2 +- >> include/linux/kgdb.h | 2 +- >> 14 files changed, 14 insertions(+), 14 deletions(-) >> >> diff --git a/arch/arc/kernel/kgdb.c b/arch/arc/kernel/kgdb.c >> index 9a3c34af2ae8..bfd04b442e36 100644 >> --- a/arch/arc/kernel/kgdb.c >> +++ b/arch/arc/kernel/kgdb.c >> @@ -204,7 +204,7 @@ void kgdb_roundup_cpus(unsigned long flags) >> local_irq_disable(); >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* breakpoint instruction: TRAP_S 0x3 */ >> #ifdef CONFIG_CPU_BIG_ENDIAN >> .gdb_bpt_instr = {0x78, 0x7e}, >> diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c >> index caa0dbe3dc61..21a6d5958955 100644 >> --- a/arch/arm/kernel/kgdb.c >> +++ b/arch/arm/kernel/kgdb.c >> @@ -274,7 +274,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) >> * and we handle the normal undef case within the do_undefinstr >> * handler. >> */ >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> #ifndef __ARMEB__ >> .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} >> #else /* ! __ARMEB__ */ >> diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c >> index a20de58061a8..fe1d1f935b90 100644 >> --- a/arch/arm64/kernel/kgdb.c >> +++ b/arch/arm64/kernel/kgdb.c >> @@ -357,7 +357,7 @@ void kgdb_arch_exit(void) >> unregister_die_notifier(&kgdb_notifier); >> } >> >> -struct kgdb_arch arch_kgdb_ops; >> +const struct kgdb_arch arch_kgdb_ops; >> >> int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) >> { >> diff --git a/arch/h8300/kernel/kgdb.c b/arch/h8300/kernel/kgdb.c >> index 1a1d30cb0609..602e478afbd5 100644 >> --- a/arch/h8300/kernel/kgdb.c >> +++ b/arch/h8300/kernel/kgdb.c >> @@ -129,7 +129,7 @@ void kgdb_arch_exit(void) >> /* Nothing to do */ >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: trapa #2 */ >> .gdb_bpt_instr = { 0x57, 0x20 }, >> }; >> diff --git a/arch/hexagon/kernel/kgdb.c b/arch/hexagon/kernel/kgdb.c >> index 16c24b22d0b2..f1924d483e78 100644 >> --- a/arch/hexagon/kernel/kgdb.c >> +++ b/arch/hexagon/kernel/kgdb.c >> @@ -83,7 +83,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { >> { "syscall_nr", GDB_SIZEOF_REG, offsetof(struct pt_regs, syscall_nr)}, >> }; >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* trap0(#0xDB) 0x0cdb0054 */ >> .gdb_bpt_instr = {0x54, 0x00, 0xdb, 0x0c}, >> }; >> diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c >> index 6366f69d118e..130cd0f064ce 100644 >> --- a/arch/microblaze/kernel/kgdb.c >> +++ b/arch/microblaze/kernel/kgdb.c >> @@ -143,7 +143,7 @@ void kgdb_arch_exit(void) >> /* >> * Global data >> */ >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> #ifdef __MICROBLAZEEL__ >> .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ >> #else >> diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c >> index 31eff1bec577..edfdc2ec2d16 100644 >> --- a/arch/mips/kernel/kgdb.c >> +++ b/arch/mips/kernel/kgdb.c >> @@ -394,7 +394,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, >> return -1; >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> #ifdef CONFIG_CPU_BIG_ENDIAN >> .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, >> #else >> diff --git a/arch/nios2/kernel/kgdb.c b/arch/nios2/kernel/kgdb.c >> index 117859122d1c..37b25f844a2d 100644 >> --- a/arch/nios2/kernel/kgdb.c >> +++ b/arch/nios2/kernel/kgdb.c >> @@ -165,7 +165,7 @@ void kgdb_arch_exit(void) >> /* Nothing to do */ >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: trap 30 */ >> .gdb_bpt_instr = { 0xba, 0x6f, 0x3b, 0x00 }, >> }; >> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c >> index 59c578f865aa..bdb588b1d8fb 100644 >> --- a/arch/powerpc/kernel/kgdb.c >> +++ b/arch/powerpc/kernel/kgdb.c >> @@ -477,7 +477,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) >> /* >> * Global data >> */ >> -struct kgdb_arch arch_kgdb_ops; >> +const struct kgdb_arch arch_kgdb_ops; >> >> static int kgdb_not_implemented(struct pt_regs *regs) >> { >> diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c >> index 4f04c6638a4d..a24c48446e98 100644 >> --- a/arch/sh/kernel/kgdb.c >> +++ b/arch/sh/kernel/kgdb.c >> @@ -382,7 +382,7 @@ void kgdb_arch_exit(void) >> unregister_die_notifier(&kgdb_notifier); >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: trapa #0x3c */ >> #ifdef CONFIG_CPU_LITTLE_ENDIAN >> .gdb_bpt_instr = { 0x3c, 0xc3 }, >> diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c >> index 639c8e54530a..7580775a14b9 100644 >> --- a/arch/sparc/kernel/kgdb_32.c >> +++ b/arch/sparc/kernel/kgdb_32.c >> @@ -166,7 +166,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) >> regs->npc = regs->pc + 4; >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: ta 0x7d */ >> .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, >> }; >> diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c >> index a68bbddbdba4..5d6c2d287e85 100644 >> --- a/arch/sparc/kernel/kgdb_64.c >> +++ b/arch/sparc/kernel/kgdb_64.c >> @@ -195,7 +195,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) >> regs->tnpc = regs->tpc + 4; >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: ta 0x72 */ >> .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, >> }; >> diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c >> index 8e36f249646e..e7effc02f13c 100644 >> --- a/arch/x86/kernel/kgdb.c >> +++ b/arch/x86/kernel/kgdb.c >> @@ -804,7 +804,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) >> (char *)bpt->saved_instr, BREAK_INSTR_SIZE); >> } >> >> -struct kgdb_arch arch_kgdb_ops = { >> +const struct kgdb_arch arch_kgdb_ops = { >> /* Breakpoint instruction: */ >> .gdb_bpt_instr = { 0xcc }, >> .flags = KGDB_HW_BREAKPOINT, >> diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h >> index e465bb15912d..3bf313311cca 100644 >> --- a/include/linux/kgdb.h >> +++ b/include/linux/kgdb.h >> @@ -281,7 +281,7 @@ struct kgdb_io { >> int is_console; >> }; >> >> -extern struct kgdb_arch arch_kgdb_ops; >> +extern const struct kgdb_arch arch_kgdb_ops; >> >> extern unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs); >> >> -- >> 2.13.3 >>
diff --git a/arch/arc/kernel/kgdb.c b/arch/arc/kernel/kgdb.c index 9a3c34af2ae8..bfd04b442e36 100644 --- a/arch/arc/kernel/kgdb.c +++ b/arch/arc/kernel/kgdb.c @@ -204,7 +204,7 @@ void kgdb_roundup_cpus(unsigned long flags) local_irq_disable(); } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* breakpoint instruction: TRAP_S 0x3 */ #ifdef CONFIG_CPU_BIG_ENDIAN .gdb_bpt_instr = {0x78, 0x7e}, diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c index caa0dbe3dc61..21a6d5958955 100644 --- a/arch/arm/kernel/kgdb.c +++ b/arch/arm/kernel/kgdb.c @@ -274,7 +274,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) * and we handle the normal undef case within the do_undefinstr * handler. */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c index a20de58061a8..fe1d1f935b90 100644 --- a/arch/arm64/kernel/kgdb.c +++ b/arch/arm64/kernel/kgdb.c @@ -357,7 +357,7 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } -struct kgdb_arch arch_kgdb_ops; +const struct kgdb_arch arch_kgdb_ops; int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) { diff --git a/arch/h8300/kernel/kgdb.c b/arch/h8300/kernel/kgdb.c index 1a1d30cb0609..602e478afbd5 100644 --- a/arch/h8300/kernel/kgdb.c +++ b/arch/h8300/kernel/kgdb.c @@ -129,7 +129,7 @@ void kgdb_arch_exit(void) /* Nothing to do */ } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: trapa #2 */ .gdb_bpt_instr = { 0x57, 0x20 }, }; diff --git a/arch/hexagon/kernel/kgdb.c b/arch/hexagon/kernel/kgdb.c index 16c24b22d0b2..f1924d483e78 100644 --- a/arch/hexagon/kernel/kgdb.c +++ b/arch/hexagon/kernel/kgdb.c @@ -83,7 +83,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { { "syscall_nr", GDB_SIZEOF_REG, offsetof(struct pt_regs, syscall_nr)}, }; -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* trap0(#0xDB) 0x0cdb0054 */ .gdb_bpt_instr = {0x54, 0x00, 0xdb, 0x0c}, }; diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c index 6366f69d118e..130cd0f064ce 100644 --- a/arch/microblaze/kernel/kgdb.c +++ b/arch/microblaze/kernel/kgdb.c @@ -143,7 +143,7 @@ void kgdb_arch_exit(void) /* * Global data */ -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { #ifdef __MICROBLAZEEL__ .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ #else diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index 31eff1bec577..edfdc2ec2d16 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c @@ -394,7 +394,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, return -1; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { #ifdef CONFIG_CPU_BIG_ENDIAN .gdb_bpt_instr = { spec_op << 2, 0x00, 0x00, break_op }, #else diff --git a/arch/nios2/kernel/kgdb.c b/arch/nios2/kernel/kgdb.c index 117859122d1c..37b25f844a2d 100644 --- a/arch/nios2/kernel/kgdb.c +++ b/arch/nios2/kernel/kgdb.c @@ -165,7 +165,7 @@ void kgdb_arch_exit(void) /* Nothing to do */ } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: trap 30 */ .gdb_bpt_instr = { 0xba, 0x6f, 0x3b, 0x00 }, }; diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 59c578f865aa..bdb588b1d8fb 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c @@ -477,7 +477,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) /* * Global data */ -struct kgdb_arch arch_kgdb_ops; +const struct kgdb_arch arch_kgdb_ops; static int kgdb_not_implemented(struct pt_regs *regs) { diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c index 4f04c6638a4d..a24c48446e98 100644 --- a/arch/sh/kernel/kgdb.c +++ b/arch/sh/kernel/kgdb.c @@ -382,7 +382,7 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c index 639c8e54530a..7580775a14b9 100644 --- a/arch/sparc/kernel/kgdb_32.c +++ b/arch/sparc/kernel/kgdb_32.c @@ -166,7 +166,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) regs->npc = regs->pc + 4; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c index a68bbddbdba4..5d6c2d287e85 100644 --- a/arch/sparc/kernel/kgdb_64.c +++ b/arch/sparc/kernel/kgdb_64.c @@ -195,7 +195,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) regs->tnpc = regs->tpc + 4; } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 8e36f249646e..e7effc02f13c 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -804,7 +804,7 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) (char *)bpt->saved_instr, BREAK_INSTR_SIZE); } -struct kgdb_arch arch_kgdb_ops = { +const struct kgdb_arch arch_kgdb_ops = { /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h index e465bb15912d..3bf313311cca 100644 --- a/include/linux/kgdb.h +++ b/include/linux/kgdb.h @@ -281,7 +281,7 @@ struct kgdb_io { int is_console; }; -extern struct kgdb_arch arch_kgdb_ops; +extern const struct kgdb_arch arch_kgdb_ops; extern unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs);
checkpatch.pl reports the following: WARNING: struct kgdb_arch should normally be const #28: FILE: arch/mips/kernel/kgdb.c:397: +struct kgdb_arch arch_kgdb_ops = { This report makes sense, as all other ops struct, this one should also be const. This patch does the change. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/arc/kernel/kgdb.c | 2 +- arch/arm/kernel/kgdb.c | 2 +- arch/arm64/kernel/kgdb.c | 2 +- arch/h8300/kernel/kgdb.c | 2 +- arch/hexagon/kernel/kgdb.c | 2 +- arch/microblaze/kernel/kgdb.c | 2 +- arch/mips/kernel/kgdb.c | 2 +- arch/nios2/kernel/kgdb.c | 2 +- arch/powerpc/kernel/kgdb.c | 2 +- arch/sh/kernel/kgdb.c | 2 +- arch/sparc/kernel/kgdb_32.c | 2 +- arch/sparc/kernel/kgdb_64.c | 2 +- arch/x86/kernel/kgdb.c | 2 +- include/linux/kgdb.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)