Revert "[MIPS] DEC: Fix modpost warning."
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=96532151ff3567154cac92983b9edc3138fa097c
Commit: 96532151ff3567154cac92983b9edc3138fa097c
Parent: 3bd39664481fc51d82e58a3bec6ba77febc7dfae
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Jul 11 00:07:34 2007 +0100
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Jul 12 17:41:06 2007 +0100
Revert "[MIPS] DEC: Fix modpost warning."
This reverts commit 8713762acf341edea9d25d6a4817f235c67bc004.
---
drivers/tc/zs.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 4fff61b..61de78a 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -143,7 +143,7 @@ static struct console sercons;
static unsigned long break_pressed; /* break, really ... */
#endif
-static unsigned char zs_init_regs[16] = {
+static unsigned char zs_init_regs[16] __initdata = {
0, /* write 0 */
0, /* write 1 */
0, /* write 2 */
@@ -1581,7 +1581,7 @@ static void __init show_serial_version(void)
/* Initialize Z8530s zs_channels
*/
-static void probe_sccs(void)
+static void __init probe_sccs(void)
{
struct dec_serial **pp;
int i, n, n_chips = 0, n_channels, chip, channel;
@@ -1923,7 +1923,7 @@ static struct tty_driver *serial_console_device(struct
console *c, int *index)
* - initialize the serial port
* Return non-zero if we didn't find a serial port.
*/
-static int serial_console_setup(struct console *co, char *options)
+static int __init serial_console_setup(struct console *co, char *options)
{
struct dec_serial *info;
int baud = 9600;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[MIPS] DEC: Fix modpost warning.
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ddfada5ac00647ed0e6091322acff9d615bf7497
Commit: ddfada5ac00647ed0e6091322acff9d615bf7497
Parent: 96532151ff3567154cac92983b9edc3138fa097c
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Jul 11 00:20:01 2007 +0100
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Jul 12 17:41:07 2007 +0100
[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 <[EMAIL PROTECTED]>
---
drivers/tc/zs.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 61de78a..ed979f1 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -136,7 +136,7 @@ struct dec_serial *zs_chain;/* list of all channels
*/
struct tty_struct zs_ttys[NUM_CHANNELS];
#ifdef CONFIG_SERIAL_DEC_CONSOLE
-static struct console sercons;
+static struct console zs_console;
#endif
#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
!defined(MODULE)
@@ -383,7 +383,7 @@ static void receive_chars(struct dec_serial *info)
#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
!defined(MODULE)
- if (break_pressed && info->line == sercons.index) {
+ if (break_pressed && info->line == zs_console.index) {
/* Ignore the null char got when BREAK is removed. */
if (ch == 0)
continue;
@@ -446,7 +446,7 @@ static void status_handle(struct dec_serial *info)
if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) {
#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
!defined(MODULE)
- if (info->line == sercons.index) {
+ if (info->line == zs_console.index) {
if (!break_pressed)
break_pressed = jiffies;
} else
@@ -1557,9 +1557,9 @@ static int rs_open(struct tty_struct *tty, struct file *
filp)
}
#ifdef CONFIG_SERIAL_DEC_CONSOLE
- if (sercons.cflag && sercons.index == line) {
- tty->termios->c_cflag = sercons.cflag;
- sercons.cflag = 0;
+ if (zs_console.cflag && zs_console.index == line) {
+ tty->termios->c_cflag = zs_console.cflag;
+ zs_console.cflag = 0;
change_speed(info);
}
#endif
@@ -2069,7 +2069,7 @@ static int __init serial_console_setup(struct console
*co, char *options)
return 0;
}
-static struct console sercons = {
+static struct console zs_console = {
.name = "ttyS",
.write = serial_console_write,
.device = serial_console_device,
@@ -2083,7 +2083,7 @@ static struct console sercons = {
*/
void __init zs_serial_console_init(void)
{
- register_console(&sercons);
+ register_console(&zs_console);
}
#endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[MIPS] DEC: Fix modpost warning.
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bf74b964775009071cf12f9d59d4dd5e388fbe0b
Commit: bf74b964775009071cf12f9d59d4dd5e388fbe0b
Parent: 46cc84bf412f95610b25e59d575aada6a5512f3a
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 10 08:14:15 2007 +0100
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 17:33:05 2007 +0100
[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 <[EMAIL PROTECTED]>
---
drivers/tc/zs.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 61de78a..4fff61b 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -143,7 +143,7 @@ static struct console sercons;
static unsigned long break_pressed; /* break, really ... */
#endif
-static unsigned char zs_init_regs[16] __initdata = {
+static unsigned char zs_init_regs[16] = {
0, /* write 0 */
0, /* write 1 */
0, /* write 2 */
@@ -1581,7 +1581,7 @@ static void __init show_serial_version(void)
/* Initialize Z8530s zs_channels
*/
-static void __init probe_sccs(void)
+static void probe_sccs(void)
{
struct dec_serial **pp;
int i, n, n_chips = 0, n_channels, chip, channel;
@@ -1923,7 +1923,7 @@ static struct tty_driver *serial_console_device(struct
console *c, int *index)
* - initialize the serial port
* Return non-zero if we didn't find a serial port.
*/
-static int __init serial_console_setup(struct console *co, char *options)
+static int serial_console_setup(struct console *co, char *options)
{
struct dec_serial *info;
int baud = 9600;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
