2 files changed, 13 insertions, 15 deletions

diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c
index c3750c2c4113..c85598acb8fd 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
@@ -430,22 +430,12 @@ void __init alternative_instructions(void)
  * And on the local CPU you need to be protected again NMI or MCE handlers
  * seeing an inconsistent instruction while you patch.
  */
-void __kprobes text_poke(void *oaddr, unsigned char *opcode, int len)
+void __kprobes text_poke(void *addr, unsigned char *opcode, int len)
 {
-        u8 *addr = oaddr;
-        if (!pte_write(*lookup_address((unsigned long)addr))) {
-                struct page *p[2] = { virt_to_page(addr), virt_to_page(addr+PAGE_SIZE) };
-                addr = vmap(p, 2, VM_MAP, PAGE_KERNEL);
-                if (!addr)
-                        return;
-                addr += ((unsigned long)oaddr) % PAGE_SIZE;
-        }
         memcpy(addr, opcode, len);
         sync_core();
         /* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline
            case. */
         if (cpu_has_clflush)
-                asm("clflush (%0) " :: "r" (oaddr) : "memory");
-        if (addr != oaddr)
-                vunmap(addr);
+                asm("clflush (%0) " :: "r" (addr) : "memory");
 }
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 1b1a1e66d099..4c4809f13cb1 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -800,9 +800,17 @@ void mark_rodata_ro(void)
         unsigned long start = PFN_ALIGN(_text);
         unsigned long size = PFN_ALIGN(_etext) - start;
 
-        change_page_attr(virt_to_page(start),
-                         size >> PAGE_SHIFT, PAGE_KERNEL_RX);
-        printk("Write protecting the kernel text: %luk\n", size >> 10);
+#ifndef CONFIG_KPROBES
+#ifdef CONFIG_HOTPLUG_CPU
+        /* It must still be possible to apply SMP alternatives. */
+        if (num_possible_cpus() <= 1)
+#endif
+        {
+                change_page_attr(virt_to_page(start),
+                                 size >> PAGE_SHIFT, PAGE_KERNEL_RX);
+                printk("Write protecting the kernel text: %luk\n", size >> 10);
+        }
+#endif
         start += size;
         size = (unsigned long)__end_rodata - start;
         change_page_attr(virt_to_page(start),