x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>

Use a more current logging style:

 - Bare printks should have a KERN_<LEVEL> for consistency's sake
 - Add pr_fmt where appropriate
 - Neaten some macro definitions
 - Convert some Ok output to OK
 - Use "%s: ", __func__ in pr_fmt for summit
 - Convert some printks to pr_<level>

Message output is not identical in all cases.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: levinsasha928@gmail.com
Link: http://lkml.kernel.org/r/1337655007.24226.10.camel@joe2Laptop
[ merged two similar patches, tidied up the changelog ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 975f709e09ae..8251be02301e 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -26,16 +26,16 @@ extern pgd_t init_level4_pgt[];
 extern void paging_init(void);
 
 #define pte_ERROR(e)                                    \
-        printk("%s:%d: bad pte %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pte %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pte_val(e))
 #define pmd_ERROR(e)                                    \
-        printk("%s:%d: bad pmd %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pmd %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pmd_val(e))
 #define pud_ERROR(e)                                    \
-        printk("%s:%d: bad pud %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pud %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pud_val(e))
 #define pgd_ERROR(e)                                    \
-        printk("%s:%d: bad pgd %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pgd %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pgd_val(e))
 
 struct mm_struct;