lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 079/329] x86/power: Fix swsusp_arch_resume prototype
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 328008a72d38b5bde6491e463405c34a81a65d3e ]

    The declaration for swsusp_arch_resume marks it as 'asmlinkage', but the
    definition in x86-32 does not, and it fails to include the header with the
    declaration. This leads to a warning when building with
    link-time-optimizations:

    kernel/power/power.h:108:23: error: type of 'swsusp_arch_resume' does not match original declaration [-Werror=lto-type-mismatch]
    extern asmlinkage int swsusp_arch_resume(void);
    ^
    arch/x86/power/hibernate_32.c:148:0: note: 'swsusp_arch_resume' was previously declared here
    int swsusp_arch_resume(void)

    This moves the declaration into a globally visible header file and fixes up
    both x86 definitions to match it.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Nicolas Pitre <nico@linaro.org>
    Cc: linux-pm@vger.kernel.org
    Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
    Cc: Pavel Machek <pavel@ucw.cz>
    Cc: Bart Van Assche <bart.vanassche@wdc.com>
    Link: https://lkml.kernel.org/r/20180202145634.200291-2-arnd@arndb.de
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/power/hibernate_32.c | 2 +-
    arch/x86/power/hibernate_64.c | 2 +-
    include/linux/suspend.h | 2 ++
    kernel/power/power.h | 3 ---
    4 files changed, 4 insertions(+), 5 deletions(-)

    --- a/arch/x86/power/hibernate_32.c
    +++ b/arch/x86/power/hibernate_32.c
    @@ -142,7 +142,7 @@ static inline void resume_init_first_lev
    #endif
    }

    -int swsusp_arch_resume(void)
    +asmlinkage int swsusp_arch_resume(void)
    {
    int error;

    --- a/arch/x86/power/hibernate_64.c
    +++ b/arch/x86/power/hibernate_64.c
    @@ -149,7 +149,7 @@ static int relocate_restore_code(void)
    return 0;
    }

    -int swsusp_arch_resume(void)
    +asmlinkage int swsusp_arch_resume(void)
    {
    int error;

    --- a/include/linux/suspend.h
    +++ b/include/linux/suspend.h
    @@ -378,6 +378,8 @@ extern int swsusp_page_is_forbidden(stru
    extern void swsusp_set_page_free(struct page *);
    extern void swsusp_unset_page_free(struct page *);
    extern unsigned long get_safe_page(gfp_t gfp_mask);
    +extern asmlinkage int swsusp_arch_suspend(void);
    +extern asmlinkage int swsusp_arch_resume(void);

    extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
    extern int hibernate(void);
    --- a/kernel/power/power.h
    +++ b/kernel/power/power.h
    @@ -103,9 +103,6 @@ extern int in_suspend;
    extern dev_t swsusp_resume_device;
    extern sector_t swsusp_resume_block;

    -extern asmlinkage int swsusp_arch_suspend(void);
    -extern asmlinkage int swsusp_arch_resume(void);
    -
    extern int create_basic_memory_bitmaps(void);
    extern void free_basic_memory_bitmaps(void);
    extern int hibernate_preallocate_memory(void);

    \
     
     \ /
      Last update: 2018-05-28 16:44    [W:2.476 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site