Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc41e4a authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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: default avatarJoe 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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 314ba352

arch/arm/lib/io-acorn.S

+2 −1
Original line number Diff line number Diff line
@@ -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



/*

arch/arm/vfp/vfphw.S

+4 −3
Original line number Diff line number Diff line
@@ -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
@@ -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
@@ -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
@@ -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

arch/frv/kernel/kernel_thread.S

+1 −1
Original line number Diff line number Diff line
@@ -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: