The patch titled xen: don't bother trying to set cr4 has been added to the -mm tree. Its filename is xen-dont-bother-trying-to-set-cr4.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: xen: don't bother trying to set cr4 From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> Xen ignores all updates to cr4, and some versions will kill the domain if you try to change its value. Just ignore all changes. Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/i386/xen/enlighten.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/i386/xen/enlighten.c~xen-dont-bother-trying-to-set-cr4 arch/i386/xen/enlighten.c --- a/arch/i386/xen/enlighten.c~xen-dont-bother-trying-to-set-cr4 +++ a/arch/i386/xen/enlighten.c @@ -623,8 +623,8 @@ static unsigned long xen_read_cr2_direct static void xen_write_cr4(unsigned long cr4) { - /* never allow TSC to be disabled */ - native_write_cr4(cr4 & ~X86_CR4_TSD); + /* Just ignore cr4 changes; Xen doesn't allow us to do + anything anyway. */ } static unsigned long xen_read_cr3(void) _ Patches currently in -mm which might be from jeremy@xxxxxxxx are xen-dont-bother-trying-to-set-cr4.patch git-netdev-all.patch enforce-noreplace-smp-in-alternative_instructions.patch maps2-uninline-some-functions-in-the-page-walker.patch maps2-eliminate-the-pmd_walker-struct-in-the-page-walker.patch maps2-remove-vma-from-args-in-the-page-walker.patch maps2-propagate-errors-from-callback-in-page-walker.patch maps2-add-callbacks-for-each-level-to-page-walker.patch maps2-move-the-page-walker-code-to-lib.patch maps2-simplify-interdependence-of-proc-pid-maps-and-smaps.patch maps2-move-clear_refs-code-to-task_mmuc.patch maps2-regroup-task_mmu-by-interface.patch maps2-make-proc-pid-smaps-optional-under-config_embedded.patch maps2-make-proc-pid-clear_refs-option-under-config_embedded.patch maps2-add-proc-pid-pagemap-interface.patch maps2-add-proc-kpagemap-interface.patch fix-the-softlockup-watchdog-to-actually-work.patch argv_split-allow-argv_split-to-handle-null-pointer-in-argcp-parameter-gracefully.patch core_pattern-ignore-rlimit_core-if-core_pattern-is-a-pipe.patch core_pattern-ignore-rlimit_core-if-core_pattern-is-a-pipe-fix.patch core_pattern-allow-passing-of-arguments-to-user-mode-helper-when-core_pattern-is-a-pipe.patch core_pattern-fix-up-a-few-miscellaneous-bugs.patch core_pattern-fix-up-a-few-miscellaneous-bugs-fix.patch add-missing-newlines-to-some-uses-of-dev_level-messages.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