Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96239f49 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

kdb: make "mdr" command repeat 



[ Upstream commit 1e0ce03bf142454f38a5fc050bf4fd698d2d36d8 ]

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

Signed-off-by: default avatarRandy 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: default avatarJason Wessel <jason.wessel@windriver.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4543d30f

kernel/debug/kdb/kdb_main.c

+21 −6
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ static int kdb_md(int argc, const char **argv) 
	int symbolic = 0;

	int valid = 0;

	int phys = 0;

	int raw = 0;



	kdbgetintenv("MDCOUNT", &mdcount);

	kdbgetintenv("RADIX", &radix);
@@ -1533,9 +1534,10 @@ static int kdb_md(int argc, const char **argv) 
	repeat = mdcount * 16 / bytesperword;



	if (strcmp(argv[0], "mdr") == 0) {

		if (argc != 2)

		if (argc == 2 || (argc == 0 && last_addr != 0))

			valid = raw = 1;

		else

			return KDB_ARGCOUNT;

		valid = 1;

	} else if (isdigit(argv[0][2])) {

		bytesperword = (int)(argv[0][2] - '0');

		if (bytesperword == 0) {
@@ -1571,6 +1573,9 @@ static int kdb_md(int argc, const char **argv) 
		radix = last_radix;

		bytesperword = last_bytesperword;

		repeat = last_repeat;

		if (raw)

			mdcount = repeat;

		else

			mdcount = ((repeat * bytesperword) + 15) / 16;

	}
@@ -1588,6 +1593,9 @@ static int kdb_md(int argc, const char **argv) 
			diag = kdbgetularg(argv[nextarg], &val);

			if (!diag) {

				mdcount = (int) val;

				if (raw)

					repeat = mdcount;

				else

					repeat = mdcount * 16 / bytesperword;

			}

		}
@@ -1598,8 +1606,15 @@ static int kdb_md(int argc, const char **argv) 
		}

	}



	if (strcmp(argv[0], "mdr") == 0)

		return kdb_mdr(addr, mdcount);

	if (strcmp(argv[0], "mdr") == 0) {

		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) {

	case 10: