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

Commit 0825f49f authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

x86/efi: move asmlinkage before return type 

Make the code like the rest of the kernel.

Link: http://lkml.kernel.org/r/1cd3d401626e51ea0e2333a860e76e80bc560a4c.1499284835.git.joe@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cef25c1

arch/x86/include/asm/efi.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 




#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32





extern unsigned long asmlinkage efi_call_phys(void *, ...);

extern asmlinkage unsigned long efi_call_phys(void *, ...);





#define arch_efi_call_virt_setup()	kernel_fpu_begin()

#define arch_efi_call_virt_setup()	kernel_fpu_begin()

#define arch_efi_call_virt_teardown()	kernel_fpu_end()

#define arch_efi_call_virt_teardown()	kernel_fpu_end()
@@ -52,7 +52,7 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); 




#define EFI_LOADER_SIGNATURE	"EL64"

#define EFI_LOADER_SIGNATURE	"EL64"





extern u64 asmlinkage efi_call(void *fp, ...);

extern asmlinkage u64 efi_call(void *fp, ...);





#define efi_call_phys(f, args...)		efi_call((f), args)

#define efi_call_phys(f, args...)		efi_call((f), args)