From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 25 01:20:21 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 09E1571F;
 Thu, 25 Oct 2012 01:20:21 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id E4D208FC08;
 Thu, 25 Oct 2012 01:20:20 +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 q9P1KKBe039433;
 Thu, 25 Oct 2012 01:20:20 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P1KK76039431;
 Thu, 25 Oct 2012 01:20:20 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210250120.q9P1KK76039431@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 25 Oct 2012 01:20:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r242023 - stable/7/usr.sbin/memcontrol
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2012 01:20:21 -0000

Author: eadler
Date: Thu Oct 25 01:20:20 2012
New Revision: 242023
URL: http://svn.freebsd.org/changeset/base/242023

Log:
  MFC r241829:
  Fix conditional expression: previously a bit vector was being operated
  	on by a logical not instead of the entire expression.
  
  Approved by:	cperciva (implicit)

Modified:
  stable/7/usr.sbin/memcontrol/memcontrol.c
Directory Properties:
  stable/7/usr.sbin/memcontrol/   (props changed)

Modified: stable/7/usr.sbin/memcontrol/memcontrol.c
==============================================================================
--- stable/7/usr.sbin/memcontrol/memcontrol.c	Thu Oct 25 01:20:19 2012	(r242022)
+++ stable/7/usr.sbin/memcontrol/memcontrol.c	Thu Oct 25 01:20:20 2012	(r242023)
@@ -235,7 +235,7 @@ setfunc(int memfd, int argc, char *argv[
     while(argc--) {
 	for (i = 0; attrnames[i].name != NULL; i++) {
 	    if (!strcmp(attrnames[i].name, argv[0])) {
-		if (!attrnames[i].kind & MDF_SETTABLE)
+		if (!(attrnames[i].kind & MDF_SETTABLE))
 		    help("flags");
 		mrd.mr_flags |= attrnames[i].val;
 		break;