diff options
| author | Tony Lindgren | 2015-07-06 14:33:17 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2015-07-06 14:33:17 +0200 |
| commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
| tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /Documentation/prctl | |
| parent | ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_... (diff) | |
| parent | ARM: dts: am4372.dtsi: disable rfbi (diff) | |
| download | kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.gz kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'Documentation/prctl')
| -rw-r--r-- | Documentation/prctl/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/prctl/Makefile b/Documentation/prctl/Makefile index 2948b7b124b9..44de3080c7f2 100644 --- a/Documentation/prctl/Makefile +++ b/Documentation/prctl/Makefile @@ -1,3 +1,4 @@ +ifndef CROSS_COMPILE # List of programs to build hostprogs-$(CONFIG_X86) := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test disable-tsc-test # Tell kbuild to always build the programs @@ -6,3 +7,4 @@ always := $(hostprogs-y) HOSTCFLAGS_disable-tsc-ctxt-sw-stress-test.o += -I$(objtree)/usr/include HOSTCFLAGS_disable-tsc-on-off-stress-test.o += -I$(objtree)/usr/include HOSTCFLAGS_disable-tsc-test.o += -I$(objtree)/usr/include +endif |