diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-02-22 13:43:26 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-02-22 13:43:26 +0100 |
| commit | 2a8c3a6410f042e89e36df20b465845852aa3d9f (patch) | |
| tree | 19e545ea1afa98744817d63426e7217e03322eea /lib/test_printf.c | |
| parent | 8a8109f303e25a27f92c1d8edd67d7cbbc60a4eb (diff) | |
| parent | 5ead723a20e0447bc7db33dc3070b420e5f80aa6 (diff) | |
| download | linux-2a8c3a6410f042e89e36df20b465845852aa3d9f.tar.gz linux-2a8c3a6410f042e89e36df20b465845852aa3d9f.tar.bz2 linux-2a8c3a6410f042e89e36df20b465845852aa3d9f.zip | |
Merge branch 'for-5.12-no_hash_pointers' into for-linus
Diffstat (limited to 'lib/test_printf.c')
| -rw-r--r-- | lib/test_printf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/test_printf.c b/lib/test_printf.c index 7ac87f18a10f..a6755798e9e6 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -30,11 +30,13 @@ #define PAD_SIZE 16 #define FILL_CHAR '$' -static unsigned total_tests __initdata; -static unsigned failed_tests __initdata; +KSTM_MODULE_GLOBALS(); + static char *test_buffer __initdata; static char *alloced_buffer __initdata; +extern bool no_hash_pointers; + static int __printf(4, 0) __init do_test(int bufsize, const char *expect, int elen, const char *fmt, va_list ap) @@ -301,6 +303,12 @@ plain(void) { int err; + if (no_hash_pointers) { + pr_warn("skipping plain 'p' tests"); + skipped_tests += 2; + return; + } + err = plain_hash(); if (err) { pr_warn("plain 'p' does not appear to be hashed\n"); |