From 35408b3817370b5c90c27477daea5e3631a125e5 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 22 Mar 2006 00:07:35 -0800
Subject: [PATCH] --- yaml --- r: 22421 b: refs/heads/master c:
 4078006568c142a909e7889cbdc28804cec25461 h: refs/heads/master i:   22419:
 38acf33ce331560065041336409f187104620dd9 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/efi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e98b4dcb665b..45478ec9433b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 152475cb0a65ed73301cfbd7d7afab65536643f7
+refs/heads/master: 4078006568c142a909e7889cbdc28804cec25461
diff --git a/trunk/arch/i386/kernel/efi.c b/trunk/arch/i386/kernel/efi.c
index c9cad7ba0d2d..aeabb4196861 100644
--- a/trunk/arch/i386/kernel/efi.c
+++ b/trunk/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();