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

Commit 5062910a authored by WANG Cong's avatar WANG Cong Committed by Linus Torvalds
Browse files

uml: improve error messages 



These error messages are from check_sysemu(), not check_ptrace().

Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc717687

arch/um/os-Linux/start_up.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ static void __init check_sysemu(void) 




	if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0,

	if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0,

		   (void *) PTRACE_O_TRACESYSGOOD) < 0))

		   (void *) PTRACE_O_TRACESYSGOOD) < 0))

		fatal_perror("check_ptrace: PTRACE_OLDSETOPTIONS failed");

		fatal_perror("check_sysemu: PTRACE_OLDSETOPTIONS failed");





	while (1) {

	while (1) {

		count++;

		count++;
@@ -252,12 +252,12 @@ static void __init check_sysemu(void) 
			goto fail;

			goto fail;

		CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));

		CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));

		if (n < 0)

		if (n < 0)

			fatal_perror("check_ptrace : wait failed");

			fatal_perror("check_sysemu: wait failed");





		if (WIFSTOPPED(status) &&

		if (WIFSTOPPED(status) &&

		    (WSTOPSIG(status) == (SIGTRAP|0x80))) {

		    (WSTOPSIG(status) == (SIGTRAP|0x80))) {

			if (!count) {

			if (!count) {

				non_fatal("check_ptrace : SYSEMU_SINGLESTEP "

				non_fatal("check_sysemu: SYSEMU_SINGLESTEP "

					  "doesn't singlestep");

					  "doesn't singlestep");

				goto fail;

				goto fail;

			}

			}
@@ -271,7 +271,7 @@ static void __init check_sysemu(void) 
		else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP))

		else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP))

			count++;

			count++;

		else {

		else {

			non_fatal("check_ptrace : expected SIGTRAP or "

			non_fatal("check_sysemu: expected SIGTRAP or "

				  "(SIGTRAP | 0x80), got status = %d\n",

				  "(SIGTRAP | 0x80), got status = %d\n",

				  status);

				  status);

			goto fail;

			goto fail;