Messages in this thread Patch in this message | | | Date | Tue, 24 Feb 2004 14:00:51 +0100 | From | Pavel Machek <> | Subject | swsusp/s3: Assembly interactions need asmlinkage |
| |
Hi!
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. Please apply, Pavel
--- tmp/linux/drivers/acpi/hardware/hwsleep.c 2004-02-05 01:53:59.000000000 +0100 +++ linux/drivers/acpi/hardware/hwsleep.c 2004-02-23 21:47:23.000000000 +0100 @@ -205,7 +205,7 @@ * ******************************************************************************/ -acpi_status +acpi_status asmlinkage acpi_enter_sleep_state ( u8 sleep_state) { --- tmp/linux/include/linux/suspend.h 2004-02-24 13:21:40.000000000 +0100 +++ linux/include/linux/suspend.h 2004-02-23 20:57:04.000000000 +0100 @@ -82,4 +82,10 @@ } #endif /* CONFIG_PM */ +asmlinkage extern void do_magic(int is_resume); +asmlinkage extern void do_magic_resume_1(void); +asmlinkage extern void do_magic_resume_2(void); +asmlinkage extern void do_magic_suspend_1(void); +asmlinkage extern void do_magic_suspend_2(void); + #endif /* _LINUX_SWSUSP_H */ -- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |