From 6551ce0fd374e376d8e89bdb92cf845a4eee2a15 Mon Sep 17 00:00:00 2001
From: EunBong Song <eunb.song@samsung.com>
Date: Sun, 24 Mar 2013 22:18:35 +0000
Subject: [PATCH] --- yaml --- r: 362259 b: refs/heads/master c:
 ed1197f9317c960a199f491779e056c572506dd3 h: refs/heads/master i:   362257:
 1e719d00375531713fa8c9a823ee00d810a6ba27   362255:
 e6741358c8f407bf5deba7d92809d3c398c27036 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/cavium-octeon/setup.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 875455b61095..4ef31d7cd5db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaa9fad32fa80878e6935c5668098c9b55b31458
+refs/heads/master: ed1197f9317c960a199f491779e056c572506dd3
diff --git a/trunk/arch/mips/cavium-octeon/setup.c b/trunk/arch/mips/cavium-octeon/setup.c
index c594a3d4f743..b0baa299f899 100644
--- a/trunk/arch/mips/cavium-octeon/setup.c
+++ b/trunk/arch/mips/cavium-octeon/setup.c
@@ -174,7 +174,10 @@ static int octeon_kexec_prepare(struct kimage *image)
 
 static void octeon_generic_shutdown(void)
 {
-	int cpu, i;
+	int i;
+#ifdef CONFIG_SMP
+	int cpu;
+#endif
 	struct cvmx_bootmem_desc *bootmem_desc;
 	void *named_block_array_ptr;