diff options
author | kib <kib@FreeBSD.org> | 2014-12-15 10:46:07 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2014-12-15 10:46:07 +0000 |
commit | 014daa8f250fa7181e72f7495dd3602045257539 (patch) | |
tree | f4a4457f24af857e818781d409cdfaf6a32fa871 /sys/powerpc | |
parent | f3b24d37fe0bc2f15b3611d3908de277f59199ae (diff) | |
download | FreeBSD-src-014daa8f250fa7181e72f7495dd3602045257539.zip FreeBSD-src-014daa8f250fa7181e72f7495dd3602045257539.tar.gz |
MFC r275616:
Thread waiting for the vfork(2)-ed child to exec or exit, must allow
for the suspension.
MFC r275683 (by andreast):
Fix build for powerpc(32|64) kernels.
MFC r275686 (by andreast):
Fix kernel build for booke.
r275639 (by andrew) is not merged, since arm/arm/syscall.c is not
present on the stable/10 branch, and arm/arm/trap.c already includes
sys/kernel.h.
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/trap.c | 1 | ||||
-rw-r--r-- | sys/powerpc/booke/trap.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index 9b9801f..c2db1cf 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/syscall.h> #include <sys/sysent.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/uio.h> #include <sys/signalvar.h> #include <sys/vmmeter.h> diff --git a/sys/powerpc/booke/trap.c b/sys/powerpc/booke/trap.c index 476f77f..eacd3e7 100644 --- a/sys/powerpc/booke/trap.c +++ b/sys/powerpc/booke/trap.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/syscall.h> #include <sys/sysent.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/uio.h> #include <sys/signalvar.h> #include <sys/vmmeter.h> |