From owner-svn-src-stable-9@FreeBSD.ORG  Sat Feb 18 00:45:59 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C356106564A;
	Sat, 18 Feb 2012 00:45:59 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AEC38FC12;
	Sat, 18 Feb 2012 00:45:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1I0jxqe003572;
	Sat, 18 Feb 2012 00:45:59 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1I0jxSi003569;
	Sat, 18 Feb 2012 00:45:59 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201202180045.q1I0jxSi003569@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 18 Feb 2012 00:45:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231887 - in stable/9/sys: kern sys
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Feb 2012 00:45:59 -0000

Author: kib
Date: Sat Feb 18 00:45:59 2012
New Revision: 231887
URL: http://svn.freebsd.org/changeset/base/231887

Log:
  MFC r231521:
  The PTRACESTOP() macro is used only once. Inline the only use and remove
  the macro.

Modified:
  stable/9/sys/kern/subr_syscall.c
  stable/9/sys/sys/ptrace.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/subr_syscall.c
==============================================================================
--- stable/9/sys/kern/subr_syscall.c	Sat Feb 18 00:35:23 2012	(r231886)
+++ stable/9/sys/kern/subr_syscall.c	Sat Feb 18 00:45:59 2012	(r231887)
@@ -85,7 +85,11 @@ syscallenter(struct thread *td, struct s
 
 	if (error == 0) {
 		STOPEVENT(p, S_SCE, sa->narg);
-		PTRACESTOP_SC(p, td, S_PT_SCE);
+		if (p->p_flag & P_TRACED && p->p_stops & S_PT_SCE) {
+			PROC_LOCK(p);
+			ptracestop((td), SIGTRAP);
+			PROC_UNLOCK(p);
+		}
 		if (td->td_dbgflags & TDB_USERWR) {
 			/*
 			 * Reread syscall number and arguments if

Modified: stable/9/sys/sys/ptrace.h
==============================================================================
--- stable/9/sys/sys/ptrace.h	Sat Feb 18 00:35:23 2012	(r231886)
+++ stable/9/sys/sys/ptrace.h	Sat Feb 18 00:45:59 2012	(r231887)
@@ -131,12 +131,6 @@ struct ptrace_vm_entry {
 
 #ifdef _KERNEL
 
-#define	PTRACESTOP_SC(p, td, flag)				\
-	if ((p)->p_flag & P_TRACED && (p)->p_stops & (flag)) {	\
-		PROC_LOCK(p);					\
-		ptracestop((td), SIGTRAP);			\
-		PROC_UNLOCK(p);					\
-	}
 /*
  * The flags below are used for ptrace(2) tracing and have no relation
  * to procfs.  They are stored in struct proc's p_stops member.