diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-17 22:36:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-17 22:36:47 +0300 |
| commit | 2ab99e54584e0048b9c0bea2d61053a61bae0bbc (patch) | |
| tree | be38193d1e196b9ad6c439fd6febf2d8308b80ae /tools/testing | |
| parent | a46310bfae94cfadf3d28a4d97b71e3e4dcc954c (diff) | |
| parent | 1c4debc443ef7037dcb7c4f08c33b9caebd21d2e (diff) | |
| download | linux-2ab99e54584e0048b9c0bea2d61053a61bae0bbc.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Four patches.
Subsystems affected by this patch series: mm/swap, kconfig, ocfs2, and
selftests"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
selftests: vm: fix clang build error multiple output files
ocfs2: fix crash when initialize filecheck kobj fails
configs/debug: restore DEBUG_INFO=y for overriding
mm: swap: get rid of livelock in swapin readahead
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/vm/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 1607322a112c..a14b5b800897 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for vm selftests +LOCAL_HDRS += $(selfdir)/vm/local_config.h $(top_srcdir)/mm/gup_test.h + include local_config.mk uname_M := $(shell uname -m 2>/dev/null || echo not) @@ -140,10 +142,6 @@ endif $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap -$(OUTPUT)/gup_test: ../../../../mm/gup_test.h - -$(OUTPUT)/hmm-tests: local_config.h - # HMM_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. $(OUTPUT)/hmm-tests: LDLIBS += $(HMM_EXTRA_LIBS) |