hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Joe Perches 2012-07-30 14:40:12 -07:00 committed by Linus Torvalds
parent 314ba3520e
commit 0cc41e4a21
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/lib/io-acorn.S
View File

@ -11,13 +11,14 @@
* *
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/kern_levels.h>
#include <asm/assembler.h> #include <asm/assembler.h>
.text .text
.align .align
.Liosl_warning: .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
/* /*

7
arch/arm/vfp/vfphw.S
View File

@ -16,6 +16,7 @@
*/ */
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/vfpmacros.h> #include <asm/vfpmacros.h>
#include <linux/kern_levels.h>
#include "../kernel/entry-header.S" #include "../kernel/entry-header.S"
.macro DBGSTR, str .macro DBGSTR, str
@ -24,7 +25,7 @@
add r0, pc, #4 add r0, pc, #4
bl printk bl printk
b 1f b 1f
.asciz "<7>VFP: \str\n" .asciz KERN_DEBUG "VFP: \str\n"
.balign 4 .balign 4
1: ldmfd sp!, {r0-r3, ip, lr} 1: ldmfd sp!, {r0-r3, ip, lr}
#endif #endif
@ -37,7 +38,7 @@
add r0, pc, #4 add r0, pc, #4
bl printk bl printk
b 1f b 1f
.asciz "<7>VFP: \str\n" .asciz KERN_DEBUG "VFP: \str\n"
.balign 4 .balign 4
1: ldmfd sp!, {r0-r3, ip, lr} 1: ldmfd sp!, {r0-r3, ip, lr}
#endif #endif
@ -52,7 +53,7 @@
add r0, pc, #4 add r0, pc, #4
bl printk bl printk
b 1f b 1f
.asciz "<7>VFP: \str\n" .asciz KERN_DEBUG "VFP: \str\n"
.balign 4 .balign 4
1: ldmfd sp!, {r0-r3, ip, lr} 1: ldmfd sp!, {r0-r3, ip, lr}
#endif #endif

2
arch/frv/kernel/kernel_thread.S
View File

@ -10,10 +10,10 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/kern_levels.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#define CLONE_VM 0x00000100 /* set if VM shared between processes */ #define CLONE_VM 0x00000100 /* set if VM shared between processes */
#define KERN_ERR "<3>"
.section .rodata .section .rodata
kernel_thread_emsg: kernel_thread_emsg: