Date: Sat, 8 Jul 2017 02:02:50 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r320798 - stable/11/sys/kern Message-ID: <201707080202.v6822ock031491@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sat Jul 8 02:02:49 2017 New Revision: 320798 URL: https://svnweb.freebsd.org/changeset/base/320798 Log: Direct commit to fix a mismerge in r320797. Modified: stable/11/sys/kern/kern_exec.c Modified: stable/11/sys/kern/kern_exec.c ============================================================================== --- stable/11/sys/kern/kern_exec.c Sat Jul 8 01:56:48 2017 (r320797) +++ stable/11/sys/kern/kern_exec.c Sat Jul 8 02:02:49 2017 (r320798) @@ -51,10 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/wait.h> #include <sys/malloc.h> #include <sys/mman.h> -#include <sys/mount.h> -#include <sys/mutex.h> -#include <sys/namei.h> -#include <sys/pioctl.h> #include <sys/priv.h> #include <sys/proc.h> #include <sys/pioctl.h> @@ -68,10 +64,7 @@ __FBSDID("$FreeBSD$"); #include <sys/syscallsubr.h> #include <sys/sysent.h> #include <sys/shm.h> -#include <sys/signalvar.h> #include <sys/smp.h> -#include <sys/stat.h> -#include <sys/syscallsubr.h> #include <sys/sysctl.h> #include <sys/vnode.h> #include <sys/stat.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707080202.v6822ock031491>