From owner-p4-projects@FreeBSD.ORG  Fri Jan 26 17:17:03 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 79E3516A403; Fri, 26 Jan 2007 17:17:03 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3824A16A401
	for <perforce@freebsd.org>; Fri, 26 Jan 2007 17:17:03 +0000 (UTC)
	(envelope-from jkim@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2883113C48A
	for <perforce@freebsd.org>; Fri, 26 Jan 2007 17:17:03 +0000 (UTC)
	(envelope-from jkim@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QHH38Y094986
	for <perforce@freebsd.org>; Fri, 26 Jan 2007 17:17:03 GMT
	(envelope-from jkim@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QHH38J094983
	for perforce@freebsd.org; Fri, 26 Jan 2007 17:17:03 GMT
	(envelope-from jkim@freebsd.org)
Date: Fri, 26 Jan 2007 17:17:03 GMT
Message-Id: <200701261717.l0QHH38J094983@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jkim@freebsd.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113570 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jan 2007 17:17:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=113570

Change 113570 by jkim@jkim_hammer on 2007/01/26 17:16:57

	Micro optimize and unconfuse.
	
	Pointed out by:	netchild

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#30 edit
.. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#24 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#30 (text+ko) ====

@@ -857,8 +857,7 @@
 	 * Linux/ia64 does the same in i386 emulation mode.
 	 */
 	bsd_args.prot = linux_args->prot;
-	if ((bsd_args.prot & PROT_WRITE) ||
-	    (bsd_args.prot & (PROT_READ | PROT_EXEC)))
+	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 
 	if (linux_args->fd != -1) {
@@ -979,8 +978,7 @@
 	bsd_args.addr = uap->addr;
 	bsd_args.len = uap->len;
 	bsd_args.prot = uap->prot;
-	if ((bsd_args.prot & PROT_WRITE) ||
-	    (bsd_args.prot & (PROT_READ | PROT_EXEC)))
+	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 	return (mprotect(td, &bsd_args));
 }

==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#24 (text+ko) ====

@@ -658,8 +658,7 @@
 	 * Linux/ia64 does the same in i386 emulation mode.
 	 */
 	bsd_args.prot = linux_args->prot;
-	if ((bsd_args.prot & PROT_WRITE) ||
-	    (bsd_args.prot & (PROT_READ | PROT_EXEC)))
+	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 
 	if (linux_args->fd != -1) {
@@ -780,8 +779,7 @@
 	bsd_args.addr = uap->addr;
 	bsd_args.len = uap->len;
 	bsd_args.prot = uap->prot;
-	if ((bsd_args.prot & PROT_WRITE) ||
-	    (bsd_args.prot & (PROT_READ | PROT_EXEC)))
+	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 	return (mprotect(td, &bsd_args));
 }