swsusp/s3: Assembly interactions need asmlinkage

swsusp/s3: Assembly interactions need asmlinkage

[Pavel Machek]

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?]


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click

Re: swsusp/s3: Assembly interactions need asmlinkage

[Bruno Ducrot]

On Tue, Feb 24, 2004 at 02:00:51PM +0100, Pavel Machek wrote:
> 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,

Does acpi_enter_sleep_state_s4bios() have the same issue ?


-- 
Bruno Ducrot

--  Which is worse:  ignorance or apathy?
--  Don't know.  Don't care.


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click

Re: swsusp/s3: Assembly interactions need asmlinkage

[Pavel Machek]

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,
> 
> Does acpi_enter_sleep_state_s4bios() have the same issue ?

Yes, it does; I missed that. Thanks. Here's the fix.
								Pavel

--- clean/drivers/acpi/hardware/hwsleep.c	2004-02-05 01:53:59.000000000 +0100
+++ linux/drivers/acpi/hardware/hwsleep.c	2004-02-25 11:08:15.000000000 +0100
@@ -359,7 +359,7 @@
  *
  ******************************************************************************/
 
-acpi_status
+acpi_status asmlinkage
 acpi_enter_sleep_state_s4bios (
 	void)
 {


-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click