[SPARC32]: Fix sparc32 modpost warnings with sunzilog
authorMartin Habets <errandir_news@mph.eclipse.co.uk>
Tue, 10 Oct 2006 21:44:01 +0000 (14:44 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 12 Oct 2006 06:56:53 +0000 (23:56 -0700)
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>
arch/sparc/kernel/setup.c
arch/sparc64/kernel/setup.c
drivers/serial/sunzilog.c

index 0251cab4708bbcf31a23f93e6d942e08f54bfc9b..f5ee1ac834bcf38c58de7f799d5054e734507fa1 100644 (file)
@@ -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.
index 958287448cfe89f1cec527fa93d15c4808bf5495..cc8ad480a204152256f97c8b44e15f3f3144c6b4 100644 (file)
@@ -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.
index 73dd2eedaaad5cff1441c6a6e1bd0923641d1677..b2cc703b2b9e976e6fc74d0f9f652a7960612c4e 100644 (file)
@@ -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,
@@ -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