Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba8cefc authored by Martin Habets's avatar Martin Habets Committed by David S. Miller
Browse files

[SPARC32]: Fix sparc32 modpost warnings with sunzilog 



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: default avatarMartin Habets <errandir_news@mph.eclipse.co.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3096de3

arch/sparc/kernel/setup.c

+0 −10
Original line number Diff line number Diff line
@@ -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.

arch/sparc64/kernel/setup.c

+0 −10
Original line number Diff line number Diff line
@@ -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.

drivers/serial/sunzilog.c

+3 −3
Original line number Diff line number Diff line
@@ -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