summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-08-03 03:08:48 +0000
committerkib <kib@FreeBSD.org>2015-08-03 03:08:48 +0000
commitfb8c9f39f40cc1e9b1d05118c7ab9b98ca6fe05c (patch)
tree7a7dcabb0813b554e10adce1acccb3829f7babf2
parentb77ef6b082c86ee78d1a404c618bf0353bc001a8 (diff)
downloadFreeBSD-src-fb8c9f39f40cc1e9b1d05118c7ab9b98ca6fe05c.zip
FreeBSD-src-fb8c9f39f40cc1e9b1d05118c7ab9b98ca6fe05c.tar.gz
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
-rw-r--r--sys/kern/kern_exec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index dc1ba50..9e4a4ff 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -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);
OpenPOWER on IntegriCloud