summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-02-24 04:05:09 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-02-24 04:05:09 -0800
commit61e7d4eb42c5e71e647ac7275f16be56036ad865 (patch)
tree21d966ef18daebeccc7c6d834861cb86624dae10 /include/linux
parent27d5bd9d446dd67398efc390004f864d4295e0ca (diff)
[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.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/suspend.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index d0cdc77fa44e..810947658d59 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -81,4 +81,10 @@ static inline void thaw_processes(void)
}
#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 */