diff options
| author | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2013-09-05 23:00:24 +0000 |
|---|---|---|
| committer | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2013-09-05 23:00:24 +0000 |
| commit | a5715964b16e55cfc5b161ec924874f6e94668de (patch) | |
| tree | 9ce5c350844ef8e9602beff8fd03dd850a035ed2 /sys | |
| parent | 87a7a3f08d2f1733e9924a759eeefa13dcc40cad (diff) | |
| download | src-a5715964b16e55cfc5b161ec924874f6e94668de.tar.gz src-a5715964b16e55cfc5b161ec924874f6e94668de.zip | |
Align stacks of kernel threads correctly at 16-byte boundaries rather than
making sure they are all misaligned at +8 bytes. This fixes clang builds
of powerpc64 kernels (aside from a required increase in KSTACK_PAGES which
will come later).
This commit from FreeBSD/powerpc64 with a clang-built kernel.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=255273
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/powerpc/aim/vm_machdep.c | 1 | ||||
| -rw-r--r-- | sys/powerpc/include/frame.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index 2deb4cbfffda..1790ce38d755 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -187,6 +187,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) cf->cf_arg1 = (register_t)tf; pcb->pcb_sp = (register_t)cf; + KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned")); #ifdef __powerpc64__ pcb->pcb_lr = ((register_t *)fork_trampoline)[0]; pcb->pcb_toc = ((register_t *)fork_trampoline)[1]; diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h index 196cb6fb8af3..092827d2df18 100644 --- a/sys/powerpc/include/frame.h +++ b/sys/powerpc/include/frame.h @@ -94,6 +94,7 @@ struct callframe { register_t cf_func; register_t cf_arg0; register_t cf_arg1; + register_t _padding; /* Maintain 16-byte alignment */ }; #else struct callframe { |