The patch titled Subject: x86/efi: move asmlinkage before return type has been added to the -mm tree. Its filename is x86-efi-move-asmlinkage-before-return-type.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/x86-efi-move-asmlinkage-before-return-type.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/x86-efi-move-asmlinkage-before-return-type.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Joe Perches <joe@xxxxxxxxxxx> Subject: 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@xxxxxxxxxxx Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx> Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/include/asm/efi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86/include/asm/efi.h~x86-efi-move-asmlinkage-before-return-type arch/x86/include/asm/efi.h --- a/arch/x86/include/asm/efi.h~x86-efi-move-asmlinkage-before-return-type +++ a/arch/x86/include/asm/efi.h @@ -33,7 +33,7 @@ #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_teardown() kernel_fpu_end() @@ -52,7 +52,7 @@ extern unsigned long asmlinkage efi_call #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) _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are checkpatch-improve-the-unnecessary-oom-message-test.patch checkpatch-warn-when-a-maintainers-entry-isnt-t.patch checkpatch-fix-stepping-through-statements-with-stat-and-ctx_statement_block.patch checkpatch-improve-tests-for-multiple-line-function-definitions.patch checkpatch-improve-macro-reuse-test.patch checkpatch-improve-multi-line-alignment-test.patch checkpatch-improve-the-storage_class-test.patch arm-kvm-move-asmlinkage-before-type.patch arm-hp-jornada-7xx-move-inline-before-return-type.patch cris-gpio-move-inline-before-return-type.patch frv-tlbflush-move-asmlinkage-before-return-type.patch ia64-move-inline-before-return-type.patch ia64-sn-pci-move-inline-before-type.patch m68k-coldfire-move-inline-before-return-type.patch mips-smp-move-asmlinkage-before-return-type.patch sh-move-inline-before-return-type.patch x86-efi-move-asmlinkage-before-return-type.patch drivers-s390-move-static-and-inline-before-return-type.patch drivers-tty-serial-move-inline-before-return-type.patch usb-serial-safe_serial-move-__inline__-before-return-type.patch video-fbdev-intelfb-move-inline-before-return-type.patch video-fbdev-omap-move-inline-before-return-type.patch arm-samsung-usb-ohci-move-inline-before-return-type.patch alsa-opl4-move-inline-before-return-type.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html