]> err.no Git - linux-2.6/commit
xen: fix mismerge in masking pte flags
authorJeremy Fitzhardinge <jeremy@goop.org>
Wed, 30 Jan 2008 12:33:39 +0000 (13:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:33:39 +0000 (13:33 +0100)
commita89780f3b84f9a421e2608580b55f12b3ac4f9c2
tree1e98414b29b773d5d1d234b3390f454e369ae756
parent261a5ec36befbe6bae069be14f45e618dcd35146
xen: fix mismerge in masking pte flags

Looks like a mismerge/misapply dropped one of the cases of pte flag
masking for Xen.  Also, only mask the flags for present ptes.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/xen/mmu.c