projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
efi_32.c
diff --git
a/arch/x86/kernel/efi_32.c
b/arch/x86/kernel/efi_32.c
index 4b63c8e1f13b1b078a42dc113403c1952c52f3cc..5cab48ee61a4a6e61e522117d97bbfdabaa95a6d 100644
(file)
--- 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.
*/
* 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 =
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);
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 =
if (cr4 & X86_CR4_PAE) {
swapper_pg_dir[pgd_index(0)].pgd =