git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
mm
/
pageattr-xen.c
diff --git
a/arch/x86_64/mm/pageattr-xen.c
b/arch/x86_64/mm/pageattr-xen.c
index
df074a0
..
c57cc62
100644
(file)
--- a/
arch/x86_64/mm/pageattr-xen.c
+++ b/
arch/x86_64/mm/pageattr-xen.c
@@
-3,7
+3,6
@@
* Thanks to Ben LaHaise for precious feedback.
*/
* Thanks to Ben LaHaise for precious feedback.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/highmem.h>
@@
-322,11
+321,13
@@
__change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
*/
#ifndef CONFIG_XEN
BUG_ON(PageReserved(kpte_page));
*/
#ifndef CONFIG_XEN
BUG_ON(PageReserved(kpte_page));
+#else
+ if(!PageReserved(kpte_page))
#endif
#endif
- if (page_private(kpte_page) == 0) {
- save_page(kpte_page);
- revert_page(address, ref_prot);
- }
+
if (page_private(kpte_page) == 0) {
+
save_page(kpte_page);
+
revert_page(address, ref_prot);
+
}
return 0;
}
return 0;
}