From: Rusty Russell <rusty@rustcorp.com.au>

Fix warning about "unused variable i" when CONFIG_PARAVIRT enabled and
CONFIG_DEBUG_PARAVIRT disabled.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/alternative.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN arch/i386/kernel/alternative.c~paravirtualization-patch-inline-replacements-for-fix-3 arch/i386/kernel/alternative.c
--- a/arch/i386/kernel/alternative.c~paravirtualization-patch-inline-replacements-for-fix-3
+++ a/arch/i386/kernel/alternative.c
@@ -352,7 +352,6 @@ void alternatives_smp_switch(int smp)
 void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)
 {
 	struct paravirt_patch *p;
-	int i;
 
 	for (p = start; p < end; p++) {
 		unsigned int used;
@@ -360,6 +359,8 @@ void apply_paravirt(struct paravirt_patc
 		used = paravirt_ops.patch(p->instrtype, p->clobbers, p->instr,
 					  p->len);
 #ifdef CONFIG_DEBUG_PARAVIRT
+		{
+		int i;
 		/* Deliberately clobber regs using "not %reg" to find bugs. */
 		for (i = 0; i < 3; i++) {
 			if (p->len - used >= 2 && (p->clobbers & (1 << i))) {
@@ -368,6 +369,7 @@ void apply_paravirt(struct paravirt_patc
 				used += 2;
 			}
 		}
+		}
 #endif
 		/* Pad the rest with nops */
 		nop_out(p->instr + used, p->len - used);
_