Skip to content

Commit

Permalink
[SPARC32]: Fix sparc32 modpost warnings with sunzilog
Browse files Browse the repository at this point in the history
Fix this 2.6.19-rc1 build warnings from modpost:

WARNING: vmlinux - Section mismatch: reference to .init.text:sunzilog_console_setup from .data between 'sunzilog_console' (at offset 0x8394) and 'devices_subsys'

Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Martin Habets authored and David S. Miller committed Oct 12, 2006
1 parent e3096de commit eba8cef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 23 deletions.
10 changes: 0 additions & 10 deletions arch/sparc/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,6 @@ static struct console prom_debug_console = {
.index = -1,
};

int obp_system_intr(void)
{
if (boot_flags & BOOTME_DEBUG) {
printk("OBP: system interrupted\n");
prom_halt();
return 1;
}
return 0;
}

/*
* Process kernel command line switches that are specific to the
* SPARC or that require special low-level processing.
Expand Down
10 changes: 0 additions & 10 deletions arch/sparc64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,6 @@ void kernel_enter_debugger(void)
{
}

int obp_system_intr(void)
{
if (boot_flags & BOOTME_DEBUG) {
printk("OBP: system interrupted\n");
prom_halt();
return 1;
}
return 0;
}

/*
* Process kernel command line switches that are specific to the
* SPARC or that require special low-level processing.
Expand Down
6 changes: 3 additions & 3 deletions drivers/serial/sunzilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
return 0;
}

static struct console sunzilog_console = {
static struct console sunzilog_console_ops = {
.name = "ttyS",
.write = sunzilog_console_write,
.device = uart_console_device,
Expand All @@ -1208,10 +1208,10 @@ static inline struct console *SUNZILOG_CONSOLE(void)
if (i == NUM_CHANNELS)
return NULL;

sunzilog_console.index = i;
sunzilog_console_ops.index = i;
sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;

return &sunzilog_console;
return &sunzilog_console_ops;
}

#else
Expand Down

0 comments on commit eba8cef

Please sign in to comment.