The patch titled
Allow boot-time disable of paravirt_ops patching
has been added to the -mm tree. Its filename is
allow-boot-time-disable-of-paravirt_ops-patching.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Allow boot-time disable of paravirt_ops patching
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Add "noreplace-paravirt" to disable paravirt_ops patching.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/kernel-parameters.txt | 3 +++
arch/i386/kernel/alternative.c | 13 +++++++++++++
2 files changed, 16 insertions(+)
diff -puN Documentation/kernel-parameters.txt~allow-boot-time-disable-of-paravirt_ops-patching Documentation/kernel-parameters.txt
--- a/Documentation/kernel-parameters.txt~allow-boot-time-disable-of-paravirt_ops-patching
+++ a/Documentation/kernel-parameters.txt
@@ -64,6 +64,7 @@ parameter is applicable:
GENERIC_TIME The generic timeofday code is enabled.
NFS Appropriate NFS support is enabled.
OSS OSS sound support is enabled.
+ PV_OPS A paravirtualized kernel
PARIDE The ParIDE subsystem is enabled.
PARISC The PA-RISC architecture is enabled.
PCI PCI bus support is enabled.
@@ -1135,6 +1136,8 @@ and is between 256 and 4096 characters.
nomce [IA-32] Machine Check Exception
+ noreplace-paravirt [IA-32,PV_OPS] Don't patch paravirt_ops
+
noreplace-smp [IA-32,SMP] Don't replace SMP instructions
with UP alternatives
diff -puN arch/i386/kernel/alternative.c~allow-boot-time-disable-of-paravirt_ops-patching arch/i386/kernel/alternative.c
--- a/arch/i386/kernel/alternative.c~allow-boot-time-disable-of-paravirt_ops-patching
+++ a/arch/i386/kernel/alternative.c
@@ -30,6 +30,16 @@ static int __init setup_noreplace_smp(ch
}
__setup("noreplace-smp", setup_noreplace_smp);
+#ifdef CONFIG_PARAVIRT
+static int noreplace_paravirt = 0;
+
+static int __init setup_noreplace_paravirt(char *str)
+{
+ noreplace_paravirt = 1;
+ return 1;
+}
+__setup("noreplace-paravirt", setup_noreplace_paravirt);
+#endif
#define DPRINTK(fmt, args...) if (debug_alternative) \
printk(KERN_DEBUG fmt, args)
@@ -329,6 +339,9 @@ void apply_paravirt(struct paravirt_patc
{
struct paravirt_patch *p;
+ if (noreplace_paravirt)
+ return;
+
for (p = start; p < end; p++) {
unsigned int used;
_
Patches currently in -mm which might be from jeremy@xxxxxxxx are
re-enable-vdso-by-default-with-paravirt.patch
remove-noreplacement-option.patch
remove-smp_alt_instructions.patch
rename-the-parainstructions-symbols-to-be-consistent-with-the-others.patch
allow-boot-time-disable-of-smp-altinstructions.patch
allow-boot-time-disable-of-paravirt_ops-patching.patch
fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch
ignore-stolen-time-in-the-softlockup-watchdog.patch
add-touch_all_softlockup_watchdogs.patch
clean-up-elf-note-generation.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
