Skip to content

Commit

Permalink
arm64: Fix duplicate definition of early_console
Browse files Browse the repository at this point in the history
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: Chen Gang <gang.chen@asianux.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Chen Gang authored and Catalin Marinas committed May 13, 2013
1 parent f722406 commit 182a6f7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/arm64/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 182a6f7

Please sign in to comment.