diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 22:19:58 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 22:19:58 +0200 |
| commit | c6bb11147eb09bd39f316c6062455b88c905ab6e (patch) | |
| tree | 5a1a6ec2970daef5fa8546741ced3ef3924bf807 /tools/testing/selftests/vm/compaction_test.c | |
| parent | a8802d97e73346bc81609df9dfba7d3306f40d87 (diff) | |
| parent | b061c7a513afe14a68af41cec7c3476befc40e95 (diff) | |
| download | talos-op-linux-c6bb11147eb09bd39f316c6062455b88c905ab6e.tar.gz talos-op-linux-c6bb11147eb09bd39f316c6062455b88c905ab6e.zip | |
Merge branch 'fortglx/4.19/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping updates from John Stultz:
- Make the timekeeping update more precise when NTP frequency is set
directly by updating the multiplier.
- Adjust selftests
Diffstat (limited to 'tools/testing/selftests/vm/compaction_test.c')
| -rw-r--r-- | tools/testing/selftests/vm/compaction_test.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/vm/compaction_test.c b/tools/testing/selftests/vm/compaction_test.c index 1097f04e4d80..bcec71250873 100644 --- a/tools/testing/selftests/vm/compaction_test.c +++ b/tools/testing/selftests/vm/compaction_test.c @@ -16,6 +16,8 @@ #include <unistd.h> #include <string.h> +#include "../kselftest.h" + #define MAP_SIZE 1048576 struct map_list { @@ -169,7 +171,7 @@ int main(int argc, char **argv) printf("Either the sysctl compact_unevictable_allowed is not\n" "set to 1 or couldn't read the proc file.\n" "Skipping the test\n"); - return 0; + return KSFT_SKIP; } lim.rlim_cur = RLIM_INFINITY; |
