Commit 599a8945 authored by Dmitri Vorobiev's avatar Dmitri Vorobiev Committed by Ralf Baechle

MIPS: Move several variables from .bss to .init.data

Several static uninitialized variables are used in the scope of __init
functions but are themselves not marked as __initdata.  This patch is to put
those variables to where they belong and to reduce the memory footprint a
little bit.

Also, a couple of lines with spaces instead of tabs were fixed.
Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@movial.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/698/Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 7326c4e5
...@@ -505,7 +505,7 @@ static int __init ar7_register_devices(void) ...@@ -505,7 +505,7 @@ static int __init ar7_register_devices(void)
int res; int res;
u32 *bootcr, val; u32 *bootcr, val;
#ifdef CONFIG_SERIAL_8250 #ifdef CONFIG_SERIAL_8250
static struct uart_port uart_port[2]; static struct uart_port uart_port[2] __initdata;
memset(uart_port, 0, sizeof(struct uart_port) * 2); memset(uart_port, 0, sizeof(struct uart_port) * 2);
......
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
static char __init *decode_eisa_sig(unsigned long addr) static char __init *decode_eisa_sig(unsigned long addr)
{ {
static char sig_str[EISA_SIG_LEN]; static char sig_str[EISA_SIG_LEN] __initdata;
u8 sig[4]; u8 sig[4];
u16 rev; u16 rev;
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
......
...@@ -67,7 +67,7 @@ void __init plat_mem_setup(void) ...@@ -67,7 +67,7 @@ void __init plat_mem_setup(void)
cserial = ArcGetEnvironmentVariable("ConsoleOut"); cserial = ArcGetEnvironmentVariable("ConsoleOut");
if ((ctype && *ctype == 'd') || (cserial && *cserial == 's')) { if ((ctype && *ctype == 'd') || (cserial && *cserial == 's')) {
static char options[8]; static char options[8] __initdata;
char *baud = ArcGetEnvironmentVariable("dbaud"); char *baud = ArcGetEnvironmentVariable("dbaud");
if (baud) if (baud)
strcpy(options, baud); strcpy(options, baud);
......
...@@ -90,7 +90,7 @@ void __init plat_mem_setup(void) ...@@ -90,7 +90,7 @@ void __init plat_mem_setup(void)
{ {
char* con = ArcGetEnvironmentVariable("console"); char* con = ArcGetEnvironmentVariable("console");
if (con && *con == 'd') { if (con && *con == 'd') {
static char options[8]; static char options[8] __initdata;
char *baud = ArcGetEnvironmentVariable("dbaud"); char *baud = ArcGetEnvironmentVariable("dbaud");
if (baud) if (baud)
strcpy(options, baud); strcpy(options, baud);
......
...@@ -60,7 +60,7 @@ static void __init sni_console_setup(void) ...@@ -60,7 +60,7 @@ static void __init sni_console_setup(void)
char *cdev; char *cdev;
char *baud; char *baud;
int port; int port;
static char options[8]; static char options[8] __initdata;
cdev = prom_getenv("console_dev"); cdev = prom_getenv("console_dev");
if (strncmp(cdev, "tty", 3) == 0) { if (strncmp(cdev, "tty", 3) == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment