aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-11-10 17:04:35 -0500
committerJesper Nilsson <jespern@axis.com>2015-12-15 08:03:11 -0500
commit56edefc98a1c3c8124823ed45260c1c912f81bb3 (patch)
treef882187037cce0be822230f936d5dcb13108abae
parentc5a37883f42be712a989e54d5d6c0159b0e56599 (diff)
cris: debugport: Fix section mismatches
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>
-rw-r--r--arch/cris/arch-v10/kernel/debugport.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 7d307cce8bd8..b6549e54be29 100644
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -468,7 +468,7 @@ etrax_console_device(struct console* co, int *index)
468#endif 468#endif
469} 469}
470 470
471static struct console sercons = { 471static struct console ser_console = {
472 name : "ttyS", 472 name : "ttyS",
473 write: console_write, 473 write: console_write,
474 read : NULL, 474 read : NULL,
@@ -480,7 +480,7 @@ static struct console sercons = {
480 cflag : 0, 480 cflag : 0,
481 next : NULL 481 next : NULL
482}; 482};
483static struct console sercons0 = { 483static struct console ser0_console = {
484 name : "ttyS", 484 name : "ttyS",
485 write: console_write, 485 write: console_write,
486 read : NULL, 486 read : NULL,
@@ -493,7 +493,7 @@ static struct console sercons0 = {
493 next : NULL 493 next : NULL
494}; 494};
495 495
496static struct console sercons1 = { 496static struct console ser1_console = {
497 name : "ttyS", 497 name : "ttyS",
498 write: console_write, 498 write: console_write,
499 read : NULL, 499 read : NULL,
@@ -505,7 +505,7 @@ static struct console sercons1 = {
505 cflag : 0, 505 cflag : 0,
506 next : NULL 506 next : NULL
507}; 507};
508static struct console sercons2 = { 508static struct console ser2_console = {
509 name : "ttyS", 509 name : "ttyS",
510 write: console_write, 510 write: console_write,
511 read : NULL, 511 read : NULL,
@@ -517,7 +517,7 @@ static struct console sercons2 = {
517 cflag : 0, 517 cflag : 0,
518 next : NULL 518 next : NULL
519}; 519};
520static struct console sercons3 = { 520static struct console ser3_console = {
521 name : "ttyS", 521 name : "ttyS",
522 write: console_write, 522 write: console_write,
523 read : NULL, 523 read : NULL,
@@ -539,17 +539,17 @@ init_etrax_debug(void)
539 static int first = 1; 539 static int first = 1;
540 540
541 if (!first) { 541 if (!first) {
542 unregister_console(&sercons); 542 unregister_console(&ser_console);
543 register_console(&sercons0); 543 register_console(&ser0_console);
544 register_console(&sercons1); 544 register_console(&ser1_console);
545 register_console(&sercons2); 545 register_console(&ser2_console);
546 register_console(&sercons3); 546 register_console(&ser3_console);
547 init_dummy_console(); 547 init_dummy_console();
548 return 0; 548 return 0;
549 } 549 }
550 550
551 first = 0; 551 first = 0;
552 register_console(&sercons); 552 register_console(&ser_console);
553 start_port(port); 553 start_port(port);
554#ifdef CONFIG_ETRAX_KGDB 554#ifdef CONFIG_ETRAX_KGDB
555 start_port(kgdb_port); 555 start_port(kgdb_port);