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]
/
include
/
asm-ia64
/
pgalloc.h
diff --git
a/include/asm-ia64/pgalloc.h
b/include/asm-ia64/pgalloc.h
index
d66b8eb
..
4e96d77
100644
(file)
--- a/
include/asm-ia64/pgalloc.h
+++ b/
include/asm-ia64/pgalloc.h
@@
-17,7
+17,6
@@
* Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com>
*/
* Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com>
*/
-#include <linux/config.h>
#include <linux/compiler.h>
#include <linux/mm.h>
#include <linux/compiler.h>
#include <linux/mm.h>
@@
-130,7
+129,11
@@
static inline void pmd_free(pmd_t * pmd)
static inline void
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
{
static inline void
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
{
+#ifndef CONFIG_XEN
pmd_val(*pmd_entry) = page_to_phys(pte);
pmd_val(*pmd_entry) = page_to_phys(pte);
+#else
+ pmd_val(*pmd_entry) = page_to_pseudophys(pte);
+#endif
}
static inline void
}
static inline void