iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/process: Constify the number of insns printed by show instructions functions.

Browse Source 
instructions_to_print var is assigned value 16 and there is no
way to change it.

This patch replaces it by a constant.

Reviewed-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2018-10-06 16:51:16 +00:00 committed by Michael Ellerman
parent fb2d9505c0
commit df13102f82
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/kernel/process.c
View File

@ -1258,17 +1258,16 @@ struct task_struct *__switch_to(struct task_struct *prev,
return last; return last;
} }
static int instructions_to_print = 16; #define NR_INSN_TO_PRINT 16
static void show_instructions(struct pt_regs *regs) static void show_instructions(struct pt_regs *regs)
{ {
int i; int i;
unsigned long pc = regs->nip - (instructions_to_print * 3 / 4 * unsigned long pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int));
sizeof(int));
printk("Instruction dump:"); printk("Instruction dump:");
for (i = 0; i < instructions_to_print; i++) { for (i = 0; i < NR_INSN_TO_PRINT; i++) {
int instr; int instr;
if (!(i % 8)) if (!(i % 8))
@ -1301,17 +1300,17 @@ static void show_instructions(struct pt_regs *regs)
void show_user_instructions(struct pt_regs *regs) void show_user_instructions(struct pt_regs *regs)
{ {
unsigned long pc; unsigned long pc;
int n = instructions_to_print; int n = NR_INSN_TO_PRINT;
struct seq_buf s; struct seq_buf s;
char buf[96]; /* enough for 8 times 9 + 2 chars */ char buf[96]; /* enough for 8 times 9 + 2 chars */
pc = regs->nip - (instructions_to_print * 3 / 4 * sizeof(int)); pc = regs->nip - (NR_INSN_TO_PRINT * 3 / 4 * sizeof(int));
/* /*
* Make sure the NIP points at userspace, not kernel text/data or * Make sure the NIP points at userspace, not kernel text/data or
* elsewhere. * elsewhere.
*/ */
if (!__access_ok(pc, instructions_to_print * sizeof(int), USER_DS)) { if (!__access_ok(pc, NR_INSN_TO_PRINT * sizeof(int), USER_DS)) {
pr_info("%s[%d]: Bad NIP, not dumping instructions.\n", pr_info("%s[%d]: Bad NIP, not dumping instructions.\n",
current->comm, current->pid); current->comm, current->pid);
return; return;