From owner-svn-src-stable@FreeBSD.ORG  Sun Mar 13 13:37:23 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95AD21065670;
	Sun, 13 Mar 2011 13:37:23 +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 841A48FC15;
	Sun, 13 Mar 2011 13:37:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2DDbNNe056167;
	Sun, 13 Mar 2011 13:37:23 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2DDbN0e056165;
	Sun, 13 Mar 2011 13:37:23 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201103131337.p2DDbN0e056165@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 13 Mar 2011 13:37:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219607 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 13 Mar 2011 13:37:23 -0000

Author: kib
Date: Sun Mar 13 13:37:23 2011
New Revision: 219607
URL: http://svn.freebsd.org/changeset/base/219607

Log:
  Fix mismerge.
  
  Pointy hat to:	kib

Modified:
  stable/7/sys/kern/imgact_shell.c

Modified: stable/7/sys/kern/imgact_shell.c
==============================================================================
--- stable/7/sys/kern/imgact_shell.c	Sun Mar 13 13:05:50 2011	(r219606)
+++ stable/7/sys/kern/imgact_shell.c	Sun Mar 13 13:37:23 2011	(r219607)
@@ -179,7 +179,7 @@ exec_shell_imgact(imgp)
 	length = (imgp->args->argc == 0) ? 0 :
 	    strlen(imgp->args->begin_argv) + 1;		/* bytes to delete */
 
-	if (offset > imgp->args->stringspace + length) {
+	if (offset > imgp->args->stringspace + length)
 		return (E2BIG);
 
 	bcopy(imgp->args->begin_argv + length, imgp->args->begin_argv + offset,