diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-09 14:30:28 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-15 14:38:10 +1000 |
| commit | 020e215f4aa8e3a02dccb7b13d7f6bba274d7501 (patch) | |
| tree | 3f40450e4aea8947ebe12fbb430f88b0cc0c0feb /arch | |
| parent | 2efc13cad6cbddeaff848f166d34e637d0e870d2 (diff) | |
acpi-fix-1
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index c00413dfa422..afc25ee9964b 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -73,7 +73,7 @@ int acpi_save_state_mem(void) #else /* CONFIG_64BIT */ header->trampoline_segment = setup_trampoline() >> 4; init_rsp = (unsigned long)temp_stack + 4096; - initial_code = wakeup_long64; + initial_code = (unsigned long)wakeup_long64; saved_magic = 0x123456789abcdef0; #endif /* CONFIG_64BIT */ diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h index b9a75d929960..b7d26caf5600 100644 --- a/arch/x86/kernel/acpi/sleep.h +++ b/arch/x86/kernel/acpi/sleep.h @@ -9,7 +9,7 @@ extern char wakeup_code_start, wakeup_code_end; extern unsigned long saved_video_mode; extern long saved_magic; extern unsigned long init_rsp; -extern void (*initial_code)(void); +extern unsigned long initial_code; extern int wakeup_pmode_return; extern char swsusp_pg_dir[PAGE_SIZE]; |