summaryrefslogtreecommitdiffstats
path: root/sys/amd64/cloudabi64/cloudabi64_sysvec.c
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-10-12 11:41:26 -0300
committerRenato Botelho <renato@netgate.com>2016-10-12 11:41:26 -0300
commitcb642130dfc50717bb970a104c44aa7690930a38 (patch)
treec67f108534217a209198c6b201949ecc73acaba3 /sys/amd64/cloudabi64/cloudabi64_sysvec.c
parent5dd7ab172435dc99e1abc1f7d73fd5e720050bbc (diff)
parentcd04fbc5e631c6b3e80a14eb7044c3be35fba2d2 (diff)
downloadFreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.zip
FreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.tar.gz
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/amd64/cloudabi64/cloudabi64_sysvec.c')
-rw-r--r--sys/amd64/cloudabi64/cloudabi64_sysvec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/amd64/cloudabi64/cloudabi64_sysvec.c b/sys/amd64/cloudabi64/cloudabi64_sysvec.c
index 08d85a2..f1b3863 100644
--- a/sys/amd64/cloudabi64/cloudabi64_sysvec.c
+++ b/sys/amd64/cloudabi64/cloudabi64_sysvec.c
@@ -171,9 +171,9 @@ cloudabi64_thread_setregs(struct thread *td,
return (error);
/* Perform standard register initialization. */
- stack.ss_sp = (void *)attr->stack;
+ stack.ss_sp = TO_PTR(attr->stack);
stack.ss_size = tcbptr - attr->stack;
- cpu_set_upcall(td, (void *)attr->entry_point, NULL, &stack);
+ cpu_set_upcall(td, TO_PTR(attr->entry_point), NULL, &stack);
/*
* Pass in the thread ID of the new thread and the argument
@@ -196,7 +196,6 @@ static struct sysentvec cloudabi64_elf_sysvec = {
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
.sv_maxuser = VM_MAXUSER_ADDRESS,
- .sv_usrstack = USRSTACK,
.sv_stackprot = VM_PROT_READ | VM_PROT_WRITE,
.sv_copyout_strings = cloudabi64_copyout_strings,
.sv_setregs = cloudabi64_proc_setregs,
OpenPOWER on IntegriCloud