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

Commit 27742380 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by John Stultz
Browse files

ARM: Fix "Make low-level printk work" to use a separate config option 



Change-Id: I5ca8db61b595adc642a07ea187bd41fd7636840e
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
parent 4e09c510

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -1623,6 +1623,14 @@ config EARLY_PRINTK 
	  kernel low-level debugging functions. Add earlyprintk to your

	  kernel parameters to enable this console.



config EARLY_PRINTK_DIRECT

	bool "Early printk direct"

	depends on DEBUG_LL

	help

	  Say Y here if you want to have an early console using the

	  kernel low-level debugging functions and EARLY_PRINTK is

	  not early enough.



config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

kernel/printk/printk.c

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "console_cmdline.h"

#include "braille.h"



#ifdef CONFIG_DEBUG_LL

#ifdef CONFIG_EARLY_PRINTK_DIRECT

extern void printascii(char *);

#endif
@@ -1728,10 +1728,6 @@ asmlinkage int vprintk_emit(int facility, int level, 
	 */

	text_len = vscnprintf(text, sizeof(textbuf), fmt, args);



#ifdef	CONFIG_DEBUG_LL

	printascii(text);

#endif



	/* mark and strip a trailing newline */

	if (text_len && text[text_len-1] == '\n') {

		text_len--;
@@ -1762,6 +1758,10 @@ asmlinkage int vprintk_emit(int facility, int level, 
		}

	}



#ifdef CONFIG_EARLY_PRINTK_DIRECT

	printascii(text);

#endif



	if (level == LOGLEVEL_DEFAULT)

		level = default_message_loglevel;