From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Jan 2008 12:33:39 +0000 (+0100)
Subject: xen: fix mismerge in masking pte flags
X-Git-Tag: v2.6.25-rc1~1143^2~152
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a89780f3b84f9a421e2608580b55f12b3ac4f9c2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed