pae: fix fixme ;)

PATCH New Gerd Knorr 1 participant 1 message Aug 8, 2005

lore

Share & tools

lore

Gerd Knorr

author

2005-08-08 14:55 UTC #0 lore raw

PATCH 1/1 pae: fix fixme ;)

Hi,

That one is obviously needed to make pae xen-linux work with more than 4GB.

Gerd

linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h +2 -1

diff -urp xen-2005-08-08-vanilla/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h xen-2005-08-08/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h
@@ -132,7 +132,8 @@ static inline int pte_none(pte_t pte)
 
 #define INVALID_P2M_ENTRY (~0U)
 #define FOREIGN_FRAME(_m) ((_m) | (1UL<<((sizeof(unsigned long)*8)-1)))
-#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT) /* FIXME */
+#define pte_mfn(_pte) ( ((_pte).pte_low >> PAGE_SHIFT) |\
+		        (((_pte).pte_high & 0xfff) << (32-PAGE_SHIFT)) )
 #define pte_pfn(_pte)                                                  \
 ({                                                                     \
        unsigned long mfn = pte_mfn(_pte);                              \