From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gerd Knorr <kraxel@suse.de>
Subject: [patch] pae: fix fixme ;)
Date: Mon, 8 Aug 2005 16:55:09 +0200
Message-ID: <20050808145509.GA1453@bytesex>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

  Hi,

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

  Gerd

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
--- xen-2005-08-08-vanilla/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h	2005-07-13 15:06:39.000000000 +0200
+++ xen-2005-08-08/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h	2005-08-08 15:03:05.000000000 +0200
@@ -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);                              \