From 637edfb76a745c5e29d45c77983458c164b76af7 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Tue, 8 Mar 2011 22:39:24 +0100 Subject: [PATCH] --- yaml --- r: 235165 b: refs/heads/master c: 2ae9d293b14d17f35eff624272cfecac7979a2ee h: refs/heads/master i: 235163: 64bdec81acd3878190e6635450065d58c8b0f8e0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/wakeup_rm.S | 2 +- trunk/arch/x86/kernel/entry_32.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8349df5c530c..595d885f2fb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c4badbdeae53d2584bb5395a062cfebed76696e +refs/heads/master: 2ae9d293b14d17f35eff624272cfecac7979a2ee diff --git a/trunk/arch/x86/kernel/acpi/wakeup_rm.S b/trunk/arch/x86/kernel/acpi/wakeup_rm.S index 6ce81ee9cb03..63b8ab524f2c 100644 --- a/trunk/arch/x86/kernel/acpi/wakeup_rm.S +++ b/trunk/arch/x86/kernel/acpi/wakeup_rm.S @@ -9,4 +9,4 @@ .globl acpi_wakeup_code acpi_wakeup_code: .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" - .size wakeup_code_start, .-wakeup_code_start + .size acpi_wakeup_code, .-acpi_wakeup_code diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S index c8b4efad7ebb..9ca3b0e343e5 100644 --- a/trunk/arch/x86/kernel/entry_32.S +++ b/trunk/arch/x86/kernel/entry_32.S @@ -1413,7 +1413,7 @@ ENTRY(async_page_fault) CFI_ADJUST_CFA_OFFSET 4 jmp error_code CFI_ENDPROC -END(apf_page_fault) +END(async_page_fault) #endif /*