The patch titled
Fix 'arch/i386/kernel/alternative.c:355: warning: unused variable 'i''
has been removed from the -mm tree. Its filename was
paravirtualization-patch-inline-replacements-for-fix-3.patch
This patch was dropped because it was folded into paravirt-i386-patch-inline-replacements-for.patch
------------------------------------------------------
Subject: Fix 'arch/i386/kernel/alternative.c:355: warning: unused variable 'i''
From: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Fix warning about "unused variable i" when CONFIG_PARAVIRT enabled and
CONFIG_DEBUG_PARAVIRT disabled.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Cc: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/alternative.c | 4 +++-
1 file 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);
_
Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are
paravirt-i386-header-and-stubs-for-paravirtualisation.patch
paravirt-i386-patch-inline-replacements-for.patch
paravirtualization-patch-inline-replacements-for-fix-3.patch
paravirt-i386-more-generic-paravirtualization.patch
paravirt-i386-allow-selected-bug-checks-to-be.patch
paravirt-i386-allow-disabling-legacy-power.patch
paravirt-i386-add-apic-accessors-to-paravirt-ops.patch
paravirt-i386-add-mmu-virtualization-to.patch
prep-for-paravirt-be-careful-about-touching-bios.patch
paravirtualization-more-generic-paravirtualization-warning-fix.patch
fix-config_paravirt.patch
fix-kunmap_atomics-use-of-kpte_clear_flush.patch
generic-bug-implementation.patch
generic-bug-for-i386.patch
generic-bug-for-x86-64.patch
bug-test-1.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
