The patch titled paravirtualization-patch-inline-replacements-for (fix) has been added to the -mm tree. Its filename is paravirtualization-patch-inline-replacements-for-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: paravirtualization-patch-inline-replacements-for (fix) From: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Don't abuse CONFIG_DEBUG_KERNEL, add CONFIG_DEBUG_PARAVIRT. 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/Kconfig.debug | 10 ++++++++++ arch/i386/kernel/alternative.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff -puN arch/i386/Kconfig.debug~paravirtualization-patch-inline-replacements-for-fix arch/i386/Kconfig.debug --- a/arch/i386/Kconfig.debug~paravirtualization-patch-inline-replacements-for-fix +++ a/arch/i386/Kconfig.debug @@ -85,4 +85,14 @@ config DOUBLEFAULT option saves about 4k and might cause you much additional grey hair. +config DEBUG_PARAVIRT + bool "Enable some paravirtualization debugging" + default y + depends on PARAVIRT && DEBUG_KERNEL + help + Currently deliberately clobbers regs which are allowed to be + clobbered in inlined paravirt hooks, even in native mode. + If turning this off solves a problem, then DISABLE_INTERRUPTS() or + ENABLE_INTERRUPTS() is lying about what registers can be clobbered. + endmenu diff -puN arch/i386/kernel/alternative.c~paravirtualization-patch-inline-replacements-for-fix arch/i386/kernel/alternative.c --- a/arch/i386/kernel/alternative.c~paravirtualization-patch-inline-replacements-for-fix +++ a/arch/i386/kernel/alternative.c @@ -359,7 +359,7 @@ void apply_paravirt(struct paravirt_patc used = paravirt_ops.patch(p->instrtype, p->clobbers, p->instr, p->len); -#ifdef CONFIG_DEBUG_KERNEL +#ifdef CONFIG_DEBUG_PARAVIRT /* Deliberately clobber regs using "not %reg" to find bugs. */ for (i = 0; i < 3; i++) { if (p->len - used >= 2 && (p->clobbers & (1 << i))) { _ Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are printk-timed-ratelimit.patch schedule-removal-of-futex_fd.patch prep-for-paravirt-be-careful-about-touching-bios.patch prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch prep-for-paravirt-desch-clearer-parameter-names.patch prep-for-paravirt-desch-clearer-parameter-names-fix.patch prep-for-paravirt-rearrange-processorh.patch paravirtualization-header-and-stubs-for.patch paravirtualization-patch-inline-replacements-for.patch paravirtualization-patch-inline-replacements-for-fix.patch paravirtualization-more-generic-paravirtualization.patch paravirtualization-allow-selected-bug-checks-to-be.patch paravirtualization-allow-disabling-legacy-power.patch paravirtualization-add-apic-accessors-to-paravirt-ops.patch paravirtualization-add-apic-accessors-to-paravirt-ops-tidy.patch paravirtualization-add-mmu-virtualization-to.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