From 20cd9766f85685617352fbc904e1b8612c30d49b Mon Sep 17 00:00:00 2001
From: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Date: Mon, 23 Nov 2009 13:53:37 +0200
Subject: [PATCH] --- yaml --- r: 177907 b: refs/heads/master c:
 599a89459f316499446fdb5c817a0a4835681bae h: refs/heads/master i:   177905:
 ccc026724b69aeb086afa63f5dd3fc011d29b924   177903:
 4eb4ff5a368c7ebc74b0c8813ac924a1b347ac63 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/ar7/platform.c        | 2 +-
 trunk/arch/mips/sgi-ip22/ip22-eisa.c  | 4 ++--
 trunk/arch/mips/sgi-ip22/ip22-setup.c | 2 +-
 trunk/arch/mips/sgi-ip32/ip32-setup.c | 2 +-
 trunk/arch/mips/sni/setup.c           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9e678d4fc383..ba6d635794c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7326c4e567b50e689d13c04d58aeffa515277ebb
+refs/heads/master: 599a89459f316499446fdb5c817a0a4835681bae
diff --git a/trunk/arch/mips/ar7/platform.c b/trunk/arch/mips/ar7/platform.c
index 835f3f0319ca..85169c08d8dc 100644
--- a/trunk/arch/mips/ar7/platform.c
+++ b/trunk/arch/mips/ar7/platform.c
@@ -505,7 +505,7 @@ static int __init ar7_register_devices(void)
 	int res;
 	u32 *bootcr, val;
 #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);
 
diff --git a/trunk/arch/mips/sgi-ip22/ip22-eisa.c b/trunk/arch/mips/sgi-ip22/ip22-eisa.c
index 1617241d2737..da44ccb20829 100644
--- a/trunk/arch/mips/sgi-ip22/ip22-eisa.c
+++ b/trunk/arch/mips/sgi-ip22/ip22-eisa.c
@@ -50,9 +50,9 @@
 
 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];
-        u16 rev;
+	u16 rev;
 	int i;
 
 	for (i = 0; i < 4; i++) {
diff --git a/trunk/arch/mips/sgi-ip22/ip22-setup.c b/trunk/arch/mips/sgi-ip22/ip22-setup.c
index b9a931358e23..5deeb68b6c9c 100644
--- a/trunk/arch/mips/sgi-ip22/ip22-setup.c
+++ b/trunk/arch/mips/sgi-ip22/ip22-setup.c
@@ -67,7 +67,7 @@ void __init plat_mem_setup(void)
 	cserial = ArcGetEnvironmentVariable("ConsoleOut");
 
 	if ((ctype && *ctype == 'd') || (cserial && *cserial == 's')) {
-		static char options[8];
+		static char options[8] __initdata;
 		char *baud = ArcGetEnvironmentVariable("dbaud");
 		if (baud)
 			strcpy(options, baud);
diff --git a/trunk/arch/mips/sgi-ip32/ip32-setup.c b/trunk/arch/mips/sgi-ip32/ip32-setup.c
index c5a5d4a31b4b..3abd1465ec02 100644
--- a/trunk/arch/mips/sgi-ip32/ip32-setup.c
+++ b/trunk/arch/mips/sgi-ip32/ip32-setup.c
@@ -90,7 +90,7 @@ void __init plat_mem_setup(void)
 	{
 		char* con = ArcGetEnvironmentVariable("console");
 		if (con && *con == 'd') {
-			static char options[8];
+			static char options[8] __initdata;
 			char *baud = ArcGetEnvironmentVariable("dbaud");
 			if (baud)
 				strcpy(options, baud);
diff --git a/trunk/arch/mips/sni/setup.c b/trunk/arch/mips/sni/setup.c
index a49272ce7ef5..d16b462154c3 100644
--- a/trunk/arch/mips/sni/setup.c
+++ b/trunk/arch/mips/sni/setup.c
@@ -60,7 +60,7 @@ static void __init sni_console_setup(void)
 	char *cdev;
 	char *baud;
 	int port;
-	static char options[8];
+	static char options[8] __initdata;
 
 	cdev = prom_getenv("console_dev");
 	if (strncmp(cdev, "tty", 3) == 0) {