diff options
Diffstat (limited to 'arch/i386/kernel/efi.c')
| -rw-r--r-- | arch/i386/kernel/efi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c index c9cad7ba0d2d..7ec6cfa01fb3 100644 --- a/arch/i386/kernel/efi.c +++ b/arch/i386/kernel/efi.c | |||
| @@ -115,7 +115,7 @@ static void efi_call_phys_epilog(void) | |||
| 115 | unsigned long cr4; | 115 | unsigned long cr4; |
| 116 | struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0); | 116 | struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0); |
| 117 | 117 | ||
| 118 | cpu_gdt_descr->address = __va(cpu_gdt_descr->address); | 118 | cpu_gdt_descr->address = (unsigned long)__va(cpu_gdt_descr->address); |
| 119 | load_gdt(cpu_gdt_descr); | 119 | load_gdt(cpu_gdt_descr); |
| 120 | 120 | ||
| 121 | cr4 = read_cr4(); | 121 | cr4 = read_cr4(); |
| @@ -543,7 +543,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, | |||
| 543 | if ((md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) > | 543 | if ((md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) > |
| 544 | 0x100000000ULL) | 544 | 0x100000000ULL) |
| 545 | continue; | 545 | continue; |
| 546 | res = alloc_bootmem_low(sizeof(struct resource)); | 546 | res = kzalloc(sizeof(struct resource), GFP_ATOMIC); |
| 547 | switch (md->type) { | 547 | switch (md->type) { |
| 548 | case EFI_RESERVED_TYPE: | 548 | case EFI_RESERVED_TYPE: |
| 549 | res->name = "Reserved Memory"; | 549 | res->name = "Reserved Memory"; |
