Commit 40780065 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 152475cb
...@@ -115,7 +115,7 @@ static void efi_call_phys_epilog(void) ...@@ -115,7 +115,7 @@ static void efi_call_phys_epilog(void)
unsigned long cr4; unsigned long cr4;
struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0); 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); load_gdt(cpu_gdt_descr);
cr4 = read_cr4(); cr4 = read_cr4();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment