arch: remove direct definitions of KERN_<LEVEL> uses

Add #include <linux/kern_levels.h> so that the #define KERN_<LEVEL> macros
don't have to be duplicated.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Kay Sievers <kay@vrfy.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/lib/io-acorn.S b/arch/arm/lib/io-acorn.S
index 1b197ea7aab3a7a074624f1f9b5e0acafc4cac50..69719bad674ddc8bce50dc3e4880b0ac7d138217 100644 (file)
--- a/arch/arm/lib/io-acorn.S
+++ b/arch/arm/lib/io-acorn.S
@@ -11,13 +11,14 @@
  *
  */
 #include <linux/linkage.h>
  *
  */
 #include <linux/linkage.h>

+#include <linux/kern_levels.h>

 #include <asm/assembler.h>
 
                .text
                .align
 
 .Liosl_warning:
 #include <asm/assembler.h>
 
                .text
                .align
 
 .Liosl_warning:

-               .ascii  "<4>insl/outsl not implemented, called from %08lX\0"
+               .ascii  KERN_WARNING "insl/outsl not implemented, called from %08lX\0"

                .align
 
 /*
                .align
 
 /*

diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index 2d30c7f6edd32ddd5b93e6b8356ae679ce983041..d50f0e486cf2b322b6e8eff1baa7c73272e66c70 100644 (file)
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -16,6 +16,7 @@
  */
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
  */
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>

+#include <linux/kern_levels.h>

 #include "../kernel/entry-header.S"
 
        .macro  DBGSTR, str
 #include "../kernel/entry-header.S"
 
        .macro  DBGSTR, str


@@ -24,7 +25,7 @@
        add     r0, pc, #4
        bl      printk
        b       1f
        add     r0, pc, #4
        bl      printk
        b       1f

-       .asciz  "<7>VFP: \str\n"
+       .asciz  KERN_DEBUG "VFP: \str\n"

        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif
        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif


@@ -37,7 +38,7 @@
        add     r0, pc, #4
        bl      printk
        b       1f
        add     r0, pc, #4
        bl      printk
        b       1f

-       .asciz  "<7>VFP: \str\n"
+       .asciz  KERN_DEBUG "VFP: \str\n"

        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif
        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif


@@ -52,7 +53,7 @@
        add     r0, pc, #4
        bl      printk
        b       1f
        add     r0, pc, #4
        bl      printk
        b       1f

-       .asciz  "<7>VFP: \str\n"
+       .asciz  KERN_DEBUG "VFP: \str\n"

        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif
        .balign 4
 1:     ldmfd   sp!, {r0-r3, ip, lr}
 #endif

diff --git a/arch/frv/kernel/kernel_thread.S b/arch/frv/kernel/kernel_thread.S
index 4531c830d20b708b6dce2ce6bf736dabdf14c4de..f0e52943f9238b17b075d6049f313be4365170c2 100644 (file)
--- a/arch/frv/kernel/kernel_thread.S
+++ b/arch/frv/kernel/kernel_thread.S
@@ -10,10 +10,10 @@
  */
 
 #include <linux/linkage.h>
  */
 
 #include <linux/linkage.h>

+#include <linux/kern_levels.h>

 #include <asm/unistd.h>
 
 #define CLONE_VM       0x00000100      /* set if VM shared between processes */
 #include <asm/unistd.h>
 
 #define CLONE_VM       0x00000100      /* set if VM shared between processes */

-#define        KERN_ERR        "<3>"

 
        .section .rodata
 kernel_thread_emsg:
 
        .section .rodata
 kernel_thread_emsg: