lkml.org 
[lkml]   [2020]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] x86/acpi: make "asmlinkage" part first thing in the function definition
Date
On Tuesday, March 3, 2020 9:41:44 PM CET Alexey Dobriyan wrote:
> g++ insists that function declaration must start with extern "C"
> (which asmlinkage expands to).
>
> gcc doesn't care.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
>
> arch/x86/kernel/acpi/sleep.c | 2 +-
> arch/x86/kernel/acpi/sleep.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- a/arch/x86/kernel/acpi/sleep.c
> +++ b/arch/x86/kernel/acpi/sleep.c
> @@ -43,7 +43,7 @@ unsigned long acpi_get_wakeup_address(void)
> *
> * Wrapper around acpi_enter_sleep_state() to be called by assmebly.
> */
> -acpi_status asmlinkage __visible x86_acpi_enter_sleep_state(u8 state)
> +asmlinkage acpi_status __visible x86_acpi_enter_sleep_state(u8 state)
> {
> return acpi_enter_sleep_state(state);
> }
> --- a/arch/x86/kernel/acpi/sleep.h
> +++ b/arch/x86/kernel/acpi/sleep.h
> @@ -19,4 +19,4 @@ extern void do_suspend_lowlevel(void);
>
> extern int x86_acpi_suspend_lowlevel(void);
>
> -acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state);
> +asmlinkage acpi_status x86_acpi_enter_sleep_state(u8 state);
>

Applied as 5.7 material, thanks!




\
 
 \ /
  Last update: 2020-03-15 02:36    [W:0.055 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site