| Message ID | ae227d64c78e893b63ed71d911e016cb88212459.1534192631.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] powerpc/process: fix nested output in show_user_instructions() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
Hi, Christophe. On Tue, Aug 14, 2018 at 08:59:20AM +0000, Christophe Leroy wrote: > instructions_to_print var is assigned value 16 and there is no > way to change it. > > This patch replaces it by a constant. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com> > --- > arch/powerpc/kernel/process.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c > index c722ce4ca1c0..6317f2ed04ab 100644 > --- a/arch/powerpc/kernel/process.c > +++ b/arch/powerpc/kernel/process.c > @@ -1259,17 +1259,16 @@ struct task_struct *__switch_to(struct task_struct *prev, > return last; > } > > -static int instructions_to_print = 16; > +#define NR_INSN_TO_PRINT 16 > > static void show_instructions(struct pt_regs *regs) > { > int i; > - unsigned long pc = regs->nip - (instructions_to_print * 3 / 4 * > - sizeof(int)); > + unsigned long pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int)); > > printk("Instruction dump:"); > > - for (i = 0; i < instructions_to_print; i++) { > + for (i = 0; i < NR_INSN_TO_PRINT; i++) { > int instr; > > if (!(i % 8)) > @@ -1306,9 +1305,9 @@ void show_user_instructions(struct pt_regs *regs) > char buf[96]; /* enough for 8 times 9 + 2 chars */ > int l = 0; > > - pc = regs->nip - (instructions_to_print * 3 / 4 * sizeof(int)); > + pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int)); > > - for (i = 0; i < instructions_to_print; i++) { > + for (i = 0; i < NR_INSN_TO_PRINT; i++) { > int instr; > > if (!(i % 8) && (i > 0)) { > -- > 2.13.3 >
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index c722ce4ca1c0..6317f2ed04ab 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -1259,17 +1259,16 @@ struct task_struct *__switch_to(struct task_struct *prev, return last; } -static int instructions_to_print = 16; +#define NR_INSN_TO_PRINT 16 static void show_instructions(struct pt_regs *regs) { int i; - unsigned long pc = regs->nip - (instructions_to_print * 3 / 4 * - sizeof(int)); + unsigned long pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int)); printk("Instruction dump:"); - for (i = 0; i < instructions_to_print; i++) { + for (i = 0; i < NR_INSN_TO_PRINT; i++) { int instr; if (!(i % 8)) @@ -1306,9 +1305,9 @@ void show_user_instructions(struct pt_regs *regs) char buf[96]; /* enough for 8 times 9 + 2 chars */ int l = 0; - pc = regs->nip - (instructions_to_print * 3 / 4 * sizeof(int)); + pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int)); - for (i = 0; i < instructions_to_print; i++) { + for (i = 0; i < NR_INSN_TO_PRINT; i++) { int instr; if (!(i % 8) && (i > 0)) {
instructions_to_print var is assigned value 16 and there is no way to change it. This patch replaces it by a constant. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/kernel/process.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)