diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 | 
| commit | f77d26a9fc525286bcef3d4f98b52e17482cf49c (patch) | |
| tree | 6b179c9aa84787773cb601a14a64255e2912154b /lib/math/prime_numbers.c | |
| parent | b6bea24d41519e8c31e4798f1c1a3f67e540c5d0 (diff) | |
| parent | f0178fc01fe46bab6a95415f5647d1a74efcad1b (diff) | |
Merge branch 'x86/entry' into ras/core
to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
Diffstat (limited to 'lib/math/prime_numbers.c')
| -rw-r--r-- | lib/math/prime_numbers.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/math/prime_numbers.c b/lib/math/prime_numbers.c index 052f5b727be7..d42cebf7407f 100644 --- a/lib/math/prime_numbers.c +++ b/lib/math/prime_numbers.c @@ -1,5 +1,5 @@  // SPDX-License-Identifier: GPL-2.0-only -#define pr_fmt(fmt) "prime numbers: " fmt "\n" +#define pr_fmt(fmt) "prime numbers: " fmt  #include <linux/module.h>  #include <linux/mutex.h> @@ -253,7 +253,7 @@ static void dump_primes(void)  	if (buf)  		bitmap_print_to_pagebuf(true, buf, p->primes, p->sz); -	pr_info("primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s", +	pr_info("primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s\n",  		p->last, p->sz, p->primes[BITS_TO_LONGS(p->sz) - 1], buf);  	rcu_read_unlock(); @@ -273,7 +273,7 @@ static int selftest(unsigned long max)  		bool fast = is_prime_number(x);  		if (slow != fast) { -			pr_err("inconsistent result for is-prime(%lu): slow=%s, fast=%s!", +			pr_err("inconsistent result for is-prime(%lu): slow=%s, fast=%s!\n",  			       x, slow ? "yes" : "no", fast ? "yes" : "no");  			goto err;  		} @@ -282,14 +282,14 @@ static int selftest(unsigned long max)  			continue;  		if (next_prime_number(last) != x) { -			pr_err("incorrect result for next-prime(%lu): expected %lu, got %lu", +			pr_err("incorrect result for next-prime(%lu): expected %lu, got %lu\n",  			       last, x, next_prime_number(last));  			goto err;  		}  		last = x;  	} -	pr_info("selftest(%lu) passed, last prime was %lu", x, last); +	pr_info("%s(%lu) passed, last prime was %lu\n", __func__, x, last);  	return 0;  err:  | 
