From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gerd Knorr <kraxel@suse.de>
Subject: [patch] pae: build fix
Date: Wed, 22 Jun 2005 16:00:25 +0200
Message-ID: <20050622140025.GA31707@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,

The patch below is needed to make pae-enabled xen build.  Not
sure why the intpte_t cast was added and whenever it is a good
idea to remove it.  Problem is that PAGE_MASK is used to
page-align both physical and virtual addresses, and the cast
causes build failures for the virtual address case.

Comments?

  Gerd

Index: xen/include/asm-x86/page.h
===================================================================
--- xen.orig/include/asm-x86/page.h	2005-06-20 12:45:29.000000000 +0200
+++ xen/include/asm-x86/page.h	2005-06-20 16:32:34.000000000 +0200
@@ -7,7 +7,8 @@
 #else
 #define PAGE_SIZE           (1 << PAGE_SHIFT)
 #endif
-#define PAGE_MASK           (~(intpte_t)(PAGE_SIZE-1))
+//#define PAGE_MASK           (~(intpte_t)(PAGE_SIZE-1))
+#define PAGE_MASK           (~(PAGE_SIZE-1))
 #define PAGE_FLAG_MASK      (~0U)
 
 #ifndef __ASSEMBLY__