Author: nyan
Date: Sun Oct 31 09:05:04 2010
New Revision: 214595
URL: http://svn.freebsd.org/changeset/base/214595

Log:
  MFC: revision 207355
  
   - Change printf() calls to uprintf() for sigreturn().
   - Normalize the messages to include both pid and thread name.

Modified:
  stable/8/sys/pc98/pc98/machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/8/sys/pc98/pc98/machdep.c    Sun Oct 31 08:50:31 2010        
(r214594)
+++ stable/8/sys/pc98/pc98/machdep.c    Sun Oct 31 09:05:04 2010        
(r214595)
@@ -885,7 +885,8 @@ freebsd4_sigreturn(td, uap)
                 * one less debugger trap, so allowing it is fairly harmless.
                 */
                if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
-                       printf("freebsd4_sigreturn: eflags = 0x%x\n", eflags);
+                       uprintf("pid %d (%s): freebsd4_sigreturn eflags = 
0x%x\n",
+                           td->td_proc->p_pid, td->td_name, eflags);
                        return (EINVAL);
                }
 
@@ -896,7 +897,8 @@ freebsd4_sigreturn(td, uap)
                 */
                cs = ucp->uc_mcontext.mc_cs;
                if (!CS_SECURE(cs)) {
-                       printf("freebsd4_sigreturn: cs = 0x%x\n", cs);
+                       uprintf("pid %d (%s): freebsd4_sigreturn cs = 0x%x\n",
+                           td->td_proc->p_pid, td->td_name, cs);
                        ksiginfo_init_trap(&ksi);
                        ksi.ksi_signo = SIGBUS;
                        ksi.ksi_code = BUS_OBJERR;
@@ -997,7 +999,8 @@ sigreturn(td, uap)
                 * one less debugger trap, so allowing it is fairly harmless.
                 */
                if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
-                       printf("sigreturn: eflags = 0x%x\n", eflags);
+                       uprintf("pid %d (%s): sigreturn eflags = 0x%x\n",
+                           td->td_proc->p_pid, td->td_name, eflags);
                        return (EINVAL);
                }
 
@@ -1008,7 +1011,8 @@ sigreturn(td, uap)
                 */
                cs = ucp->uc_mcontext.mc_cs;
                if (!CS_SECURE(cs)) {
-                       printf("sigreturn: cs = 0x%x\n", cs);
+                       uprintf("pid %d (%s): sigreturn cs = 0x%x\n",
+                           td->td_proc->p_pid, td->td_name, cs);
                        ksiginfo_init_trap(&ksi);
                        ksi.ksi_signo = SIGBUS;
                        ksi.ksi_code = BUS_OBJERR;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to