mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
e44b7b7525
Move wakeup code to .c, so that video mode setting code can be shared between boot and wakeup. Remove nasty assembly code in 64-bit case by re-using trampoline code. Stack setup was fixed to clear high 16bits of %esp, maybe that fixes some machines. .c code sharing and morse code was done H. Peter Anvin, Sam Ravnborg reviewed kbuild related stuff, and it seems okay to him. Rafael did some cleanups. [rjw: * Made the patch stop breaking compilation on x86-32 * Added arch/x86/kernel/acpi/sleep.h * Got rid of compiler warnings in arch/x86/kernel/acpi/sleep.c * Fixed 32-bit compilation on x86-64 systems * Added include/asm-x86/trampoline.h and fixed the non-SMP compilation on 64-bit x86 * Removed arch/x86/kernel/acpi/sleep_32.c which was not used * Fixed some breakage caused by the integration of smpboot.c done under us in the meantime] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
22 lines
465 B
C
22 lines
465 B
C
#ifndef __TRAMPOLINE_HEADER
|
|
#define __TRAMPOLINE_HEADER
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/*
|
|
* Trampoline 80x86 program as an array.
|
|
*/
|
|
extern const unsigned char trampoline_data [];
|
|
extern const unsigned char trampoline_end [];
|
|
extern unsigned char *trampoline_base;
|
|
|
|
extern unsigned long init_rsp;
|
|
extern unsigned long initial_code;
|
|
|
|
#define TRAMPOLINE_BASE 0x6000
|
|
extern unsigned long setup_trampoline(void);
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __TRAMPOLINE_HEADER */
|