From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux: fix warnings introduced by c/s 468
Date: Mon, 10 Mar 2008 09:31:13 +0000
Message-ID: <47D50DF1.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
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

I overlooked the compiler warnings resulting from cases where the
argument of __pte_ma() is a plain zero.

Almost as usual, written and tested on 2.6.16.60 and made apply to the
2.6.18 tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: sle10sp2-2008-03-10/include/asm-i386/mach-xen/asm/maddr.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sle10sp2-2008-03-10.orig/include/asm-i386/mach-xen/asm/maddr.h	=
2008-03-10 09:09:23.000000000 +0100
+++ sle10sp2-2008-03-10/include/asm-i386/mach-xen/asm/maddr.h	2008-03-10 =
10:17:20.000000000 +0100
@@ -154,7 +154,7 @@ static inline paddr_t pte_machine_to_phy
 #endif
=20
 #ifdef CONFIG_X86_PAE
-#define __pte_ma(x)	((pte_t) { (x), (x) >> 32 } )
+#define __pte_ma(x)	((pte_t) { (x), (maddr_t)(x) >> 32 } )
 static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
 {
 	pte_t pte;