Merge branch 'x86/urgent' into x86/pat

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / pageattr-test.c

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index 6ae1f28a7ff29c7cfddc3b65513857a17e7527dd..7c3017287119c2a5cd94469ad45d8794820aecdf 100644 (file)
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -224,8 +224,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)