Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2e949bf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

x86/power: Fix swsusp_arch_resume prototype 



[ 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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThomas 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: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd5968e8

arch/x86/power/hibernate_32.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline void resume_init_first_level_page_table(pgd_t *pg_dir) 
#endif

}



int swsusp_arch_resume(void)

asmlinkage int swsusp_arch_resume(void)

{

	int error;

arch/x86/power/hibernate_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/suspend.h

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ extern int swsusp_page_is_forbidden(struct page *); 
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);

kernel/power/power.h

+0 −3
Original line number Diff line number Diff line
@@ -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);