Commit ddfada5ac00647ed0e6091322acff9d615bf7497
1 parent
96532151ff
Exists in
master
and in
4 other branches
[MIPS] DEC: Fix modpost warning.
LD vmlinux SYSMAP System.map SYSMAP .tmp_System.map MODPOST vmlinux WARNING: drivers/built-in.o(.data+0x2480): Section mismatch: reference to .init.text: (between 'sercons' and 'ds_parms') Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
drivers/tc/zs.c
| ... | ... | @@ -136,7 +136,7 @@ |
| 136 | 136 | struct tty_struct zs_ttys[NUM_CHANNELS]; |
| 137 | 137 | |
| 138 | 138 | #ifdef CONFIG_SERIAL_DEC_CONSOLE |
| 139 | -static struct console sercons; | |
| 139 | +static struct console zs_console; | |
| 140 | 140 | #endif |
| 141 | 141 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
| 142 | 142 | !defined(MODULE) |
| ... | ... | @@ -383,7 +383,7 @@ |
| 383 | 383 | |
| 384 | 384 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
| 385 | 385 | !defined(MODULE) |
| 386 | - if (break_pressed && info->line == sercons.index) { | |
| 386 | + if (break_pressed && info->line == zs_console.index) { | |
| 387 | 387 | /* Ignore the null char got when BREAK is removed. */ |
| 388 | 388 | if (ch == 0) |
| 389 | 389 | continue; |
| ... | ... | @@ -446,7 +446,7 @@ |
| 446 | 446 | if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) { |
| 447 | 447 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
| 448 | 448 | !defined(MODULE) |
| 449 | - if (info->line == sercons.index) { | |
| 449 | + if (info->line == zs_console.index) { | |
| 450 | 450 | if (!break_pressed) |
| 451 | 451 | break_pressed = jiffies; |
| 452 | 452 | } else |
| ... | ... | @@ -1557,9 +1557,9 @@ |
| 1557 | 1557 | } |
| 1558 | 1558 | |
| 1559 | 1559 | #ifdef CONFIG_SERIAL_DEC_CONSOLE |
| 1560 | - if (sercons.cflag && sercons.index == line) { | |
| 1561 | - tty->termios->c_cflag = sercons.cflag; | |
| 1562 | - sercons.cflag = 0; | |
| 1560 | + if (zs_console.cflag && zs_console.index == line) { | |
| 1561 | + tty->termios->c_cflag = zs_console.cflag; | |
| 1562 | + zs_console.cflag = 0; | |
| 1563 | 1563 | change_speed(info); |
| 1564 | 1564 | } |
| 1565 | 1565 | #endif |
| ... | ... | @@ -2069,7 +2069,7 @@ |
| 2069 | 2069 | return 0; |
| 2070 | 2070 | } |
| 2071 | 2071 | |
| 2072 | -static struct console sercons = { | |
| 2072 | +static struct console zs_console = { | |
| 2073 | 2073 | .name = "ttyS", |
| 2074 | 2074 | .write = serial_console_write, |
| 2075 | 2075 | .device = serial_console_device, |
| ... | ... | @@ -2083,7 +2083,7 @@ |
| 2083 | 2083 | */ |
| 2084 | 2084 | void __init zs_serial_console_init(void) |
| 2085 | 2085 | { |
| 2086 | - register_console(&sercons); | |
| 2086 | + register_console(&zs_console); | |
| 2087 | 2087 | } |
| 2088 | 2088 | #endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */ |
| 2089 | 2089 |