diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-04 10:31:23 -0600 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-04 10:31:23 -0600 |
| commit | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 (patch) | |
| tree | 59831f33afc57b1979b4869f93944abb6febc446 /samples/seccomp/Makefile | |
| parent | 07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff) | |
| parent | d881d25cf5bc2fafbbfb383a475278977e1bd55a (diff) | |
| download | op-kernel-dev-eafb7b9d01a7001ff8e9624e7dcb706844f981b3.zip op-kernel-dev-eafb7b9d01a7001ff8e9624e7dcb706844f981b3.tar.gz | |
Merge tag 'seccomp-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into ra-next
- fix function prototype documentation
- fix samples to include NNP setting
- fix samples to avoid rule truncation
- fix samples hostprogs variable in Makefile
Diffstat (limited to 'samples/seccomp/Makefile')
| -rw-r--r-- | samples/seccomp/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index ae7ff6f..bf7cc6b 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -36,13 +36,13 @@ HOSTLOADLIBES_bpf-direct += $(MFLAG) HOSTLOADLIBES_bpf-fancy += $(MFLAG) HOSTLOADLIBES_dropper += $(MFLAG) endif -always := $(hostprogs-y) +always := $(hostprogs-m) else # MIPS system calls are defined based on the -mabi that is passed # to the toolchain which may or may not be a valid option # for the host toolchain. So disable tests if target architecture # is MIPS but the host isn't. ifndef CONFIG_MIPS -always := $(hostprogs-y) +always := $(hostprogs-m) endif endif |
