From owner-svn-src-all@freebsd.org  Mon Aug  3 03:08:49 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F5E99B2EAB;
 Mon,  3 Aug 2015 03:08:49 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F683191A;
 Mon,  3 Aug 2015 03:08:49 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t7338mxu097851;
 Mon, 3 Aug 2015 03:08:48 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t7338mfK097850;
 Mon, 3 Aug 2015 03:08:48 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201508030308.t7338mfK097850@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 3 Aug 2015 03:08:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286216 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2015 03:08:49 -0000

Author: kib
Date: Mon Aug  3 03:08:48 2015
New Revision: 286216
URL: https://svnweb.freebsd.org/changeset/base/286216

Log:
  Fix ia64 to not override the call stack bottom address with the
  register stack bottom address, after the merge of r284956 in r285967.
  
  Note: this is a direct commit to stable/10.
  
  Reported and tested by:	clusteradm (peter)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/kern/kern_exec.c

Modified: stable/10/sys/kern/kern_exec.c
==============================================================================
--- stable/10/sys/kern/kern_exec.c	Mon Aug  3 01:24:48 2015	(r286215)
+++ stable/10/sys/kern/kern_exec.c	Mon Aug  3 03:08:48 2015	(r286216)
@@ -1104,8 +1104,7 @@ exec_new_vmspace(imgp, sv)
 
 #ifdef __ia64__
 	/* Allocate a new register stack */
-	stack_addr = IA64_BACKINGSTORE;
-	error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz,
+	error = vm_map_stack(map, IA64_BACKINGSTORE, (vm_size_t)ssiz,
 	    sv->sv_stackprot, VM_PROT_ALL, MAP_STACK_GROWS_UP);
 	if (error)
 		return (error);