Date: Sat, 20 Jun 2015 13:25:29 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r284642 - in stable: 10/sys/i386/i386 9/sys/i386/i386 Message-ID: <201506201325.t5KDPTrs043258@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Jun 20 13:25:28 2015 New Revision: 284642 URL: https://svnweb.freebsd.org/changeset/base/284642 Log: MFC r284167: Merge r283870 from amd64: Remove unneeded NULL checks in trap_fatal(). Since td_name is an array member of struct thread, it can never be NULL, so the check can be removed. In addition, curproc can never be NULL, so remove the if statement, and splice the two printfs() together. While here, remove the u_long cast, and use the correct printf format specifier for curproc->p_pid. Requested by: jhb Modified: stable/9/sys/i386/i386/trap.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/i386/i386/trap.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/i386/i386/trap.c ============================================================================== --- stable/9/sys/i386/i386/trap.c Sat Jun 20 13:02:57 2015 (r284641) +++ stable/9/sys/i386/i386/trap.c Sat Jun 20 13:25:28 2015 (r284642) @@ -1020,12 +1020,8 @@ trap_fatal(frame, eva) if (frame->tf_eflags & PSL_VM) printf("vm86, "); printf("IOPL = %d\n", (frame->tf_eflags & PSL_IOPL) >> 12); - printf("current process = "); - if (curproc) { - printf("%lu (%s)\n", (u_long)curproc->p_pid, curthread->td_name); - } else { - printf("Idle\n"); - } + printf("current process = %d (%s)\n", + curproc->p_pid, curthread->td_name); #ifdef KDB if (debugger_on_panic || kdb_active) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506201325.t5KDPTrs043258>