[Xen-changelog] [xen-unstable] Fix BUG_ON on switch_mm if XENFEAT_writable_page_tables is enabled.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID 9f70d57aadcfbad4308abb0a8168bf779618c961
# Parent  3a2fee0d84f796603c4e3178a5416e87e6269b4e
Fix BUG_ON on switch_mm if XENFEAT_writable_page_tables is enabled.

Signed-of-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/mmu_context.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 3a2fee0d84f7 -r 9f70d57aadcf 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/mmu_context.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/mmu_context.h  Wed Aug 
09 10:53:16 2006 +0100
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/mmu_context.h  Wed Aug 
09 11:26:11 2006 +0100
@@ -51,7 +51,8 @@ static inline void switch_mm(struct mm_s
        struct mmuext_op _op[2], *op = _op;
 
        if (likely(prev != next)) {
-               BUG_ON(!test_bit(PG_pinned, &virt_to_page(next->pgd)->flags));
+               BUG_ON(!xen_feature(XENFEAT_writable_page_tables) &&
+                      !test_bit(PG_pinned, &virt_to_page(next->pgd)->flags));
 
                /* stop flush ipis for the previous mm */
                cpu_clear(cpu, prev->cpu_vm_mask);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog