diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/acpi/wakeup_rm.S | 2 | ||||
-rw-r--r-- | arch/x86/kernel/entry_32.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S index 6ce81ee9cb03..63b8ab524f2c 100644 --- a/arch/x86/kernel/acpi/wakeup_rm.S +++ b/arch/x86/kernel/acpi/wakeup_rm.S | |||
@@ -9,4 +9,4 @@ | |||
9 | .globl acpi_wakeup_code | 9 | .globl acpi_wakeup_code |
10 | acpi_wakeup_code: | 10 | acpi_wakeup_code: |
11 | .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" | 11 | .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" |
12 | .size wakeup_code_start, .-wakeup_code_start | 12 | .size acpi_wakeup_code, .-acpi_wakeup_code |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index c8b4efad7ebb..9ca3b0e343e5 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -1413,7 +1413,7 @@ ENTRY(async_page_fault) | |||
1413 | CFI_ADJUST_CFA_OFFSET 4 | 1413 | CFI_ADJUST_CFA_OFFSET 4 |
1414 | jmp error_code | 1414 | jmp error_code |
1415 | CFI_ENDPROC | 1415 | CFI_ENDPROC |
1416 | END(apf_page_fault) | 1416 | END(async_page_fault) |
1417 | #endif | 1417 | #endif |
1418 | 1418 | ||
1419 | /* | 1419 | /* |