Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / platform / efi / efi_64.c

diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 8ff1f95627f9b660f1df69486a8adbf57e5d6ebd..9bf72f5bfedb6c86c452642ca8635c0b370e64e5 100644 (file)
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -80,7 +80,7 @@ pgd_t * __init efi_call_phys_prolog(void)
        int n_pgds, i, j;
 
        if (!efi_enabled(EFI_OLD_MEMMAP)) {
-               save_pgd = (pgd_t *)read_cr3();
+               save_pgd = (pgd_t *)__read_cr3();
                write_cr3((unsigned long)efi_scratch.efi_pgt);
                goto out;
        }
@@ -649,7 +649,7 @@ efi_status_t efi_thunk_set_virtual_address_map(
        efi_sync_low_kernel_mappings();
        local_irq_save(flags);
 
-       efi_scratch.prev_cr3 = read_cr3();
+       efi_scratch.prev_cr3 = __read_cr3();
        write_cr3((unsigned long)efi_scratch.efi_pgt);
        __flush_tlb_all();