diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 11:52:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 11:52:15 +0200 |
| commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
| tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /arch/x86/kernel/efi_32.c | |
| parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
| download | op-kernel-dev-7393423dd9b5790a3115873be355e9fc862bce8f.zip op-kernel-dev-7393423dd9b5790a3115873be355e9fc862bce8f.tar.gz | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/efi_32.c')
| -rw-r--r-- | arch/x86/kernel/efi_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 4b63c8e..5cab48e 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c @@ -53,7 +53,7 @@ void efi_call_phys_prelog(void) * directory. If I have PAE, I just need to duplicate one entry in * page directory. */ - cr4 = read_cr4(); + cr4 = read_cr4_safe(); if (cr4 & X86_CR4_PAE) { efi_bak_pg_dir_pointer[0].pgd = @@ -91,7 +91,7 @@ void efi_call_phys_epilog(void) gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); - cr4 = read_cr4(); + cr4 = read_cr4_safe(); if (cr4 & X86_CR4_PAE) { swapper_pg_dir[pgd_index(0)].pgd = |
