Skip to content

Commit

Permalink
arch: remove direct definitions of KERN_<LEVEL> uses
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
JoePerches authored and torvalds committed Jul 31, 2012
1 parent 314ba35 commit 0cc41e4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion arch/arm/lib/io-acorn.S
Expand Up @@ -11,13 +11,14 @@
*
*/
#include <linux/linkage.h>
#include <linux/kern_levels.h>
#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

/*
Expand Down
7 changes: 4 additions & 3 deletions arch/arm/vfp/vfphw.S
Expand Up @@ -16,6 +16,7 @@
*/
#include <asm/thread_info.h>
#include <asm/vfpmacros.h>
#include <linux/kern_levels.h>
#include "../kernel/entry-header.S"

.macro DBGSTR, str
Expand All @@ -24,7 +25,7 @@
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
Expand All @@ -37,7 +38,7 @@
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
Expand All @@ -52,7 +53,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion arch/frv/kernel/kernel_thread.S
Expand Up @@ -10,10 +10,10 @@
*/

#include <linux/linkage.h>
#include <linux/kern_levels.h>
#include <asm/unistd.h>

#define CLONE_VM 0x00000100 /* set if VM shared between processes */
#define KERN_ERR "<3>"

.section .rodata
kernel_thread_emsg:
Expand Down

0 comments on commit 0cc41e4

Please sign in to comment.