diff options
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 5 | ||||
| -rw-r--r-- | src/arch/x86/boot/wakeup.S | 3 | ||||
| -rw-r--r-- | src/arch/x86/lib/c_start.S | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index fc862f4088..327d175584 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -754,7 +754,8 @@ extern int lowmem_backup_size; void (*acpi_do_wakeup)(u32 vector, u32 backup_source, u32 backup_target, u32 backup_size) asmlinkage = (void *)WAKEUP_BASE; -extern unsigned char __wakeup, __wakeup_size; +extern unsigned char __wakeup; +extern unsigned int __wakeup_size; void acpi_jump_to_wakeup(void *vector) { @@ -776,7 +777,7 @@ void acpi_jump_to_wakeup(void *vector) #endif /* Copy wakeup trampoline in place. */ - memcpy((void *)WAKEUP_BASE, &__wakeup, (size_t)&__wakeup_size); + memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size); #if CONFIG_COLLECT_TIMESTAMPS timestamp_add_now(TS_ACPI_WAKE_JUMP); diff --git a/src/arch/x86/boot/wakeup.S b/src/arch/x86/boot/wakeup.S index d34c583a58..8748aa63aa 100644 --- a/src/arch/x86/boot/wakeup.S +++ b/src/arch/x86/boot/wakeup.S @@ -90,5 +90,6 @@ __wakeup_segment = RELOCATED(.) .word 0x0000 .globl __wakeup_size -__wakeup_size = ( . - __wakeup) +__wakeup_size: + .long . - __wakeup diff --git a/src/arch/x86/lib/c_start.S b/src/arch/x86/lib/c_start.S index 35bc26b789..762aa8c264 100644 --- a/src/arch/x86/lib/c_start.S +++ b/src/arch/x86/lib/c_start.S @@ -250,11 +250,10 @@ gdb_stub_breakpoint: #endif - .globl gdt, gdt_end, gdt_limit, idtarg + .globl gdt, gdt_end, idtarg -gdt_limit = gdt_end - gdt - 1 /* compute the table limit */ gdtaddr: - .word gdt_limit + .word gdt_end - gdt - 1 .long gdt /* we know the offset */ .data |