The patch titled
     i386: Text Edit Lock: alternative instructions
has been removed from the -mm tree.  Its filename was
     i386-text-edit-lock-alternative-instructions.patch

This patch was dropped because it had testing failures

------------------------------------------------------
Subject: i386: Text Edit Lock: alternative instructions
From: Mathieu Desnoyers <[EMAIL PROTECTED]>

alternative.c can use the text edit lock to remove CPU HOTPLUG special cases.

Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
Cc: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/i386/kernel/alternative.c |    5 +++++
 1 files changed, 5 insertions(+)

diff -puN 
arch/i386/kernel/alternative.c~i386-text-edit-lock-alternative-instructions 
arch/i386/kernel/alternative.c
--- 
a/arch/i386/kernel/alternative.c~i386-text-edit-lock-alternative-instructions
+++ a/arch/i386/kernel/alternative.c
@@ -4,6 +4,7 @@
 #include <linux/list.h>
 #include <asm/alternative.h>
 #include <asm/sections.h>
+#include <asm/cacheflush.h>
 
 #ifdef CONFIG_HOTPLUG_CPU
 static int smp_alt_once;
@@ -185,9 +186,11 @@ void apply_alternatives(struct alt_instr
                                __FUNCTION__, a->instr, instr);
                }
 #endif
+               kernel_text_lock((unsigned long)instr, a->instrlen);
                memcpy(instr, a->replacement, a->replacementlen);
                diff = a->instrlen - a->replacementlen;
                nop_out(instr + a->replacementlen, diff);
+               kernel_text_unlock((unsigned long)instr, a->instrlen);
        }
 }
 
@@ -352,6 +355,7 @@ void apply_paravirt(struct paravirt_patc
        for (p = start; p < end; p++) {
                unsigned int used;
 
+               kernel_text_lock((unsigned long)p->instr, p->len);
                used = paravirt_ops.patch(p->instrtype, p->clobbers, p->instr,
                                          p->len);
 
@@ -359,6 +363,7 @@ void apply_paravirt(struct paravirt_patc
 
                /* Pad the rest with nops */
                nop_out(p->instr + used, p->len - used);
+               kernel_text_unlock((unsigned long)p->instr, p->len);
        }
 
        /* Sync to be conservative, in case we patched following
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

powerpc-promc-remove-undef-printk.patch
i386-text-edit-lock-alternative-instructions.patch
i386-text-edit-lock-kprobes.patch
immediate-values-global-modules-list-and-module-mutex.patch
immediate-value-architecture-independent-code.patch
immediate-values-non-optimized-architectures.patch
immediate-value-add-kconfig-menus.patch
immediate-values-kprobe-header-fix.patch
immediate-value-i386-optimization.patch
immediate-value-powerpc-optimization.patch
immediate-value-documentation.patch
f00f-bug-fixup-for-i386-use-immediate-values.patch
scheduler-profiling-use-immediate-values.patch
scheduler-profiling-use-immediate-values-fix.patch
cxgb3-vs-immediate-stuff.patch
use-data_data-in-cris.patch
add-missing-data_data-in-powerpc.patch
use-data_data-in-xtensa.patch
linux-kernel-markers-architecture-independent-code.patch
linux-kernel-markers-add-kconfig-menus-for-the-marker-code.patch
linux-kernel-markers-documentation.patch
port-of-blktrace-to-the-linux-kernel-markers.patch
port-of-blktrace-to-the-linux-kernel-markers-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to