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

Commit 182a6f73 authored by Chen Gang's avatar Chen Gang Committed by Catalin Marinas
Browse files

arm64: Fix duplicate definition of early_console 



When compiling with allmodconfig. early_console is already defined as an
extern global pointer. Need let it point to the object which we intend
to (like arm32 done).

Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f722406f

arch/arm64/kernel/early_printk.c

+3 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void early_write(struct console *con, const char *s, unsigned n) 
	}

}



static struct console early_console = {

static struct console early_console_dev = {

	.name =		"earlycon",

	.write =	early_write,

	.flags =	CON_PRINTBUFFER | CON_BOOT,
@@ -145,7 +145,8 @@ static int __init setup_early_printk(char *buf) 
		early_base = early_io_map(paddr, EARLYCON_IOBASE);



	printch = match->printch;

	register_console(&early_console);

	early_console = &early_console_dev;

	register_console(&early_console_dev);



	return 0;

}