From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Feb 2017 23:32:53 +0000 (-0800)
Subject: Merge tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c4f3f22eddc982d247ffe2a6690c3e4a5c46dd09;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'linux-kselftest-4.11-rc1' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull Kselftest update from Shuah Khan:
 "This update consists of:

   - fixes to several existing tests from Stafford Horne

   - cpufreq tests from Viresh Kumar

   - Selftest build and install fixes from Bamvor Jian Zhang and Michael
     Ellerman

   - Fixes to protection-keys tests from Dave Hansen

   - Warning fixes from Shuah Khan"

* tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (28 commits)
  selftests/powerpc: Fix remaining fallout from recent changes
  selftests/powerpc: Fix the clean rule since recent changes
  selftests: Fix the .S and .S -> .o rules
  selftests: Fix the .c linking rule
  selftests: Fix selftests build to just build, not run tests
  selftests, x86, protection_keys: fix wrong offset in siginfo
  selftests, x86, protection_keys: fix uninitialized variable warning
  selftest: cpufreq: Update MAINTAINERS file
  selftest: cpufreq: Add special tests
  selftest: cpufreq: Add support to test cpufreq modules
  selftest: cpufreq: Add suspend/resume/hibernate support
  selftest: cpufreq: Add support for cpufreq tests
  selftests: Add intel_pstate to TARGETS
  selftests/intel_pstate: Update makefile to match new style
  selftests/intel_pstate: Fix warning on loop index overflow
  cpupower: Restore format of frequency-info limit
  selftests/futex: Add headers to makefile dependencies
  selftests/futex: Add stdio used for logging
  selftests: x86 protection_keys remove dead code
  selftests: x86 protection_keys fix unused variable compile warnings
  ...
---

c4f3f22eddc982d247ffe2a6690c3e4a5c46dd09
diff --cc tools/testing/selftests/bpf/Makefile
index c7816fe60feb,058351b0694f..4b498265dae6
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -1,26 -1,7 +1,20 @@@
 -CFLAGS += -Wall -O2 -I../../../../usr/include
 +LIBDIR := ../../../lib
 +BPFOBJ := $(LIBDIR)/bpf/bpf.o
  
 -TEST_GEN_PROGS = test_verifier test_maps test_lru_map
 +CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)
 +
- test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
++TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map
  
- TEST_PROGS := $(test_objs) test_kmod.sh
- TEST_FILES := $(test_objs)
+ TEST_PROGS := test_kmod.sh
  
 +.PHONY: all clean force
 +
- all: $(test_objs)
- 
 +# force a rebuild of BPFOBJ when its dependencies are updated
 +force:
 +
 +$(BPFOBJ): force
 +	$(MAKE) -C $(dir $(BPFOBJ))
 +
 +$(test_objs): $(BPFOBJ)
 +
  include ../lib.mk
- 
- clean:
- 	$(RM) $(test_objs)
diff --cc tools/testing/selftests/vm/Makefile
index 900dfaf81051,983140e68661..4cff7e7ddcc4
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@@ -1,33 -1,24 +1,33 @@@
  # Makefile for vm selftests
  
  CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS)
- BINARIES = compaction_test
- BINARIES += hugepage-mmap
- BINARIES += hugepage-shm
- BINARIES += map_hugetlb
- BINARIES += mlock2-tests
- BINARIES += on-fault-limit
- BINARIES += thuge-gen
- BINARIES += transhuge-stress
- BINARIES += userfaultfd
- BINARIES += userfaultfd_hugetlb
- BINARIES += userfaultfd_shmem
- BINARIES += mlock-random-test
- 
- all: $(BINARIES)
- %: %.c
- 	$(CC) $(CFLAGS) -o $@ $^ -lrt
- userfaultfd: userfaultfd.c ../../../../usr/include/linux/kernel.h
- 	$(CC) $(CFLAGS) -O2 -o $@ $< -lpthread
- 
- userfaultfd_hugetlb: userfaultfd.c ../../../../usr/include/linux/kernel.h
+ LDLIBS = -lrt
+ TEST_GEN_FILES = compaction_test
+ TEST_GEN_FILES += hugepage-mmap
+ TEST_GEN_FILES += hugepage-shm
+ TEST_GEN_FILES += map_hugetlb
+ TEST_GEN_FILES += mlock2-tests
+ TEST_GEN_FILES += on-fault-limit
+ TEST_GEN_FILES += thuge-gen
+ TEST_GEN_FILES += transhuge-stress
+ TEST_GEN_FILES += userfaultfd
++TEST_GEN_FILES += userfaultfd_hugetlb
++TEST_GEN_FILES += userfaultfd_shmem
+ TEST_GEN_FILES += mlock-random-test
+ 
+ TEST_PROGS := run_vmtests
+ 
+ include ../lib.mk
+ 
+ $(OUTPUT)/userfaultfd: LDLIBS += -lpthread ../../../../usr/include/linux/kernel.h
++
++$(OUTPUT)/userfaultfd_hugetlb: userfaultfd.c ../../../../usr/include/linux/kernel.h
 +	$(CC) $(CFLAGS) -DHUGETLB_TEST -O2 -o $@ $< -lpthread
 +
- userfaultfd_shmem: userfaultfd.c ../../../../usr/include/linux/kernel.h
++$(OUTPUT)/userfaultfd_shmem: userfaultfd.c  ../../../../usr/include/linux/kernel.h
 +	$(CC) $(CFLAGS) -DSHMEM_TEST -O2 -o $@ $< -lpthread
 +
- mlock-random-test: mlock-random-test.c
- 	$(CC) $(CFLAGS) -o $@ $< -lcap
+ $(OUTPUT)/mlock-random-test: LDLIBS += -lcap
  
  ../../../../usr/include/linux/kernel.h:
  	make -C ../../../.. headers_install