Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0cc41e4a21d43695154fe6a151abf3b6f27b0bb0

Authored by Joe Perches
Committed by Linus Torvalds
1 parent 314ba3520e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 3 changed files with 7 additions and 5 deletions Side-by-side Diff

arch/arm/lib/io-acorn.S
Diff comments   View file @ 0cc41e4
... ... @@ -11,13 +11,14 @@
11 11 *
12 12 */
13 13 #include <linux/linkage.h>
  14 +#include <linux/kern_levels.h>
14 15 #include <asm/assembler.h>
15 16  
16 17 .text
17 18 .align
18 19  
19 20 .Liosl_warning:
20   - .ascii "<4>insl/outsl not implemented, called from %08lXinsl/outsl not implemented, called from %08lX\0""
  21 + .ascii KERN_WARNING "insl/outsl not implemented, called from %08lXinsl/outsl not implemented, called from %08lX\0""
21 22 .align
22 23  
23 24 /*
arch/arm/vfp/vfphw.S
Diff comments   View file @ 0cc41e4
... ... @@ -16,6 +16,7 @@
16 16 */
17 17 #include <asm/thread_info.h>
18 18 #include <asm/vfpmacros.h>
  19 +#include <linux/kern_levels.h>
19 20 #include "../kernel/entry-header.S"
20 21  
21 22 .macro DBGSTR, str
... ... @@ -24,7 +25,7 @@
24 25 add r0, pc, #4
25 26 bl printk
26 27 b 1f
27   - .asciz "<7>VFP: \str\n"
  28 + .asciz KERN_DEBUG "VFP: \str\n"
28 29 .balign 4
29 30 1: ldmfd sp!, {r0-r3, ip, lr}
30 31 #endif
... ... @@ -37,7 +38,7 @@
37 38 add r0, pc, #4
38 39 bl printk
39 40 b 1f
40   - .asciz "<7>VFP: \str\n"
  41 + .asciz KERN_DEBUG "VFP: \str\n"
41 42 .balign 4
42 43 1: ldmfd sp!, {r0-r3, ip, lr}
43 44 #endif
... ... @@ -52,7 +53,7 @@
52 53 add r0, pc, #4
53 54 bl printk
54 55 b 1f
55   - .asciz "<7>VFP: \str\n"
  56 + .asciz KERN_DEBUG "VFP: \str\n"
56 57 .balign 4
57 58 1: ldmfd sp!, {r0-r3, ip, lr}
58 59 #endif
arch/frv/kernel/kernel_thread.S
Diff comments   View file @ 0cc41e4
... ... @@ -10,10 +10,10 @@
10 10 */
11 11  
12 12 #include <linux/linkage.h>
  13 +#include <linux/kern_levels.h>
13 14 #include <asm/unistd.h>
14 15  
15 16 #define CLONE_VM 0x00000100 /* set if VM shared between processes */
16   -#define KERN_ERR "<3>"
17 17  
18 18 .section .rodata
19 19 kernel_thread_emsg: