Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 875e40b9 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Ingo Molnar
Browse files

x86: use WARN() in arch/x86/mm/pageattr.c 



Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes
part of the warning section for better reporting/collection.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: akpm@linux-foundation.org
Cc: arjan@linux.intel.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a726c600

arch/x86/mm/pageattr-test.c

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ static int pageattr_test(void) 
	failed += print_split(&sc);



	if (failed) {

		printk(KERN_ERR "NOT PASSED. Please report.\n");

		WARN_ON(1);

		WARN(1, KERN_ERR "NOT PASSED. Please report.\n");

		return -EINVAL;

	} else {

		if (print)

arch/x86/mm/pageattr.c

+1 −2
Original line number Diff line number Diff line
@@ -592,10 +592,9 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) 
	if (!pte_val(old_pte)) {

		if (!primary)

			return 0;

		printk(KERN_WARNING "CPA: called for zero pte. "

		WARN(1, KERN_WARNING "CPA: called for zero pte. "

		       "vaddr = %lx cpa->vaddr = %lx\n", address,

		       cpa->vaddr);

		WARN_ON(1);

		return -EINVAL;

	}