Commit 61e7d4eb authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] swsusp/s3: Assembly interactions need asmlinkage

From: Pavel Machek <pavel@suse.cz>

swsusp/s3 assembly parts, and parts called from assembly are not properly
marked asmlinkage; that leads to double fault on resume when someone
compiles kernel with regparm.  Thanks go to Stefan Seyfried for discovering
this.
parent 27d5bd9d
...@@ -205,7 +205,7 @@ acpi_enter_sleep_state_prep ( ...@@ -205,7 +205,7 @@ acpi_enter_sleep_state_prep (
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status asmlinkage
acpi_enter_sleep_state ( acpi_enter_sleep_state (
u8 sleep_state) u8 sleep_state)
{ {
......
...@@ -81,4 +81,10 @@ static inline void thaw_processes(void) ...@@ -81,4 +81,10 @@ static inline void thaw_processes(void)
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
asmlinkage void do_magic(int is_resume);
asmlinkage void do_magic_resume_1(void);
asmlinkage void do_magic_resume_2(void);
asmlinkage void do_magic_suspend_1(void);
asmlinkage void do_magic_suspend_2(void);
#endif /* _LINUX_SWSUSP_H */ #endif /* _LINUX_SWSUSP_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment