From: Andrew Morton <akpm@osdl.org>
Date: Wed, 22 Mar 2006 08:07:35 +0000 (-0800)
Subject: [PATCH] efi_call_phys_epilog() warning fix
X-Git-Tag: v2.6.17-rc1~1129^2~100
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4078006568c142a909e7889cbdc28804cec25461;p=~emulex%2Finfiniband.git

[PATCH] efi_call_phys_epilog() warning fix

arch/i386/kernel/efi.c: In function `efi_call_phys_epilog':                     arch/i386/kernel/efi.c:118: warning: assignment makes integer from pointer without a cast

Cc: Matt Domsch <Matt_Domsch@dell.com>
Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index c9cad7ba0d2..aeabb419686 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -115,7 +115,7 @@ static void efi_call_phys_epilog(void)
 	unsigned long cr4;
 	struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
 
-	cpu_gdt_descr->address = __va(cpu_gdt_descr->address);
+	cpu_gdt_descr->address = (unsigned long)__va(cpu_gdt_descr->address);
 	load_gdt(cpu_gdt_descr);
 
 	cr4 = read_cr4();