Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261427AbUCDD3X (ORCPT ); Wed, 3 Mar 2004 22:29:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261429AbUCDD3X (ORCPT ); Wed, 3 Mar 2004 22:29:23 -0500 Received: from fmr01.intel.com ([192.55.52.18]:4328 "EHLO hermes.fm.intel.com") by vger.kernel.org with ESMTP id S261427AbUCDD3V (ORCPT ); Wed, 3 Mar 2004 22:29:21 -0500 Subject: Re: [ACPI] swsusp/s3: Assembly interactions need asmlinkage From: Len Brown To: Pavel Machek Cc: Rusty trivial patch monkey Russell , Andrew Morton , Kernel Mailing List , Stefan Seyfried , ACPI Developers In-Reply-To: References: Content-Type: text/plain Organization: Message-Id: <1078370935.12987.514.camel@dhcppc4> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.3 Date: 03 Mar 2004 22:28:56 -0500 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2131 Lines: 65 Applied. thanks, -Len On Tue, 2004-02-24 at 08:00, 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, > 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 > _______________________________________________ > Acpi-devel mailing list > Acpi-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/acpi-devel > - 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/