redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

kdb: make "mdr" command repeat 

[ Upstream commit 1e0ce03bf1 ]

The "mdr" command should repeat (continue) when only Enter/Return
is pressed, so make it do so.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: kgdb-bugreport@lists.sourceforge.net
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Randy Dunlap 2017-12-08 10:19:19 -08:00 committed by Greg Kroah-Hartman
parent 3995803772
commit 829484eb3e
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/debug/kdb/kdb_main.c
View File

@ -1566,6 +1566,7 @@ static int kdb_md(int argc, const char **argv)
int symbolic = 0; int symbolic = 0;
int valid = 0; int valid = 0;
int phys = 0; int phys = 0;
int raw = 0;
kdbgetintenv("MDCOUNT", &mdcount); kdbgetintenv("MDCOUNT", &mdcount);
kdbgetintenv("RADIX", &radix); kdbgetintenv("RADIX", &radix);
@ -1575,9 +1576,10 @@ static int kdb_md(int argc, const char **argv)
repeat = mdcount * 16 / bytesperword; repeat = mdcount * 16 / bytesperword;
if (strcmp(argv[0], "mdr") == 0) { if (strcmp(argv[0], "mdr") == 0) {
if (argc != 2) if (argc == 2 || (argc == 0 && last_addr != 0))
valid = raw = 1;
else
return KDB_ARGCOUNT; return KDB_ARGCOUNT;
valid = 1;
} else if (isdigit(argv[0][2])) { } else if (isdigit(argv[0][2])) {
bytesperword = (int)(argv[0][2] - '0'); bytesperword = (int)(argv[0][2] - '0');
if (bytesperword == 0) { if (bytesperword == 0) {
@ -1613,7 +1615,10 @@ static int kdb_md(int argc, const char **argv)
radix = last_radix; radix = last_radix;
bytesperword = last_bytesperword; bytesperword = last_bytesperword;
repeat = last_repeat; repeat = last_repeat;
mdcount = ((repeat * bytesperword) + 15) / 16; if (raw)
mdcount = repeat;
else
mdcount = ((repeat * bytesperword) + 15) / 16;
} }
if (argc) { if (argc) {
@ -1630,7 +1635,10 @@ static int kdb_md(int argc, const char **argv)
diag = kdbgetularg(argv[nextarg], &val); diag = kdbgetularg(argv[nextarg], &val);
if (!diag) { if (!diag) {
mdcount = (int) val; mdcount = (int) val;
repeat = mdcount * 16 / bytesperword; if (raw)
repeat = mdcount;
else
repeat = mdcount * 16 / bytesperword;
} }
} }
if (argc >= nextarg+1) { if (argc >= nextarg+1) {
@ -1640,8 +1648,15 @@ static int kdb_md(int argc, const char **argv)
} }
} }
if (strcmp(argv[0], "mdr") == 0) if (strcmp(argv[0], "mdr") == 0) {
return kdb_mdr(addr, mdcount); int ret;
last_addr = addr;
ret = kdb_mdr(addr, mdcount);
last_addr += mdcount;
last_repeat = mdcount;
last_bytesperword = bytesperword; // to make REPEAT happy
return ret;
}
switch (radix) { switch (radix) {
case 10: case 10: