Skip to content

Commit

Permalink
cris: debugport: Fix section mismatches
Browse files Browse the repository at this point in the history
Section mismatches can now cause build failures, such as for
cris:allnoconfig. Rename affected variables to end with _console
to make section mismatch checks happy.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
  • Loading branch information
Guenter Roeck authored and Jesper Nilsson committed Dec 15, 2015
1 parent c5a3788 commit 56edefc
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions arch/cris/arch-v10/kernel/debugport.c
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ etrax_console_device(struct console* co, int *index)
#endif
}

static struct console sercons = {
static struct console ser_console = {
name : "ttyS",
write: console_write,
read : NULL,
Expand All @@ -480,7 +480,7 @@ static struct console sercons = {
cflag : 0,
next : NULL
};
static struct console sercons0 = {
static struct console ser0_console = {
name : "ttyS",
write: console_write,
read : NULL,
Expand All @@ -493,7 +493,7 @@ static struct console sercons0 = {
next : NULL
};

static struct console sercons1 = {
static struct console ser1_console = {
name : "ttyS",
write: console_write,
read : NULL,
Expand All @@ -505,7 +505,7 @@ static struct console sercons1 = {
cflag : 0,
next : NULL
};
static struct console sercons2 = {
static struct console ser2_console = {
name : "ttyS",
write: console_write,
read : NULL,
Expand All @@ -517,7 +517,7 @@ static struct console sercons2 = {
cflag : 0,
next : NULL
};
static struct console sercons3 = {
static struct console ser3_console = {
name : "ttyS",
write: console_write,
read : NULL,
Expand All @@ -539,17 +539,17 @@ init_etrax_debug(void)
static int first = 1;

if (!first) {
unregister_console(&sercons);
register_console(&sercons0);
register_console(&sercons1);
register_console(&sercons2);
register_console(&sercons3);
unregister_console(&ser_console);
register_console(&ser0_console);
register_console(&ser1_console);
register_console(&ser2_console);
register_console(&ser3_console);
init_dummy_console();
return 0;
}

first = 0;
register_console(&sercons);
register_console(&ser_console);
start_port(port);
#ifdef CONFIG_ETRAX_KGDB
start_port(kgdb_port);
Expand Down

0 comments on commit 56edefc

Please sign in to comment.