Subject: [merged] lto-watchdog-hpwdtc-make-assembler-label-global.patch removed from -mm tree To: ak@xxxxxxxxxxxxxxx,wim@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 12 Sep 2013 12:46:09 -0700 The patch titled Subject: lto, watchdog/hpwdt.c: make assembler label global has been removed from the -mm tree. Its filename was lto-watchdog-hpwdtc-make-assembler-label-global.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Andi Kleen <ak@xxxxxxxxxxxxxxx> Subject: lto, watchdog/hpwdt.c: make assembler label global We cannot assume that the inline assembler code always ends up in the same file as the original C file. So make any assembler labels that are called with "extern" by C global Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/hpwdt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/watchdog/hpwdt.c~lto-watchdog-hpwdtc-make-assembler-label-global drivers/watchdog/hpwdt.c --- a/drivers/watchdog/hpwdt.c~lto-watchdog-hpwdtc-make-assembler-label-global +++ a/drivers/watchdog/hpwdt.c @@ -162,7 +162,8 @@ extern asmlinkage void asminline_call(st #define HPWDT_ARCH 32 asm(".text \n\t" - ".align 4 \n" + ".align 4 \n\t" + ".globl asminline_call \n" "asminline_call: \n\t" "pushl %ebp \n\t" "movl %esp, %ebp \n\t" @@ -352,7 +353,8 @@ static int detect_cru_service(void) #define HPWDT_ARCH 64 asm(".text \n\t" - ".align 4 \n" + ".align 4 \n\t" + ".globl asminline_call \n" "asminline_call: \n\t" "pushq %rbp \n\t" "movq %rsp, %rbp \n\t" _ Patches currently in -mm which might be from ak@xxxxxxxxxxxxxxx are origin.patch x86-add-1-2-4-8-byte-optimization-to-64bit-__copy_fromto_user_inatomic.patch thp-account-anon-transparent-huge-pages-into-nr_anon_pages.patch mm-cleanup-add_to_page_cache_locked.patch thp-move-maybe_pmd_mkwrite-out-of-mk_huge_pmd.patch thp-do_huge_pmd_anonymous_page-cleanup.patch thp-consolidate-code-between-handle_mm_fault-and-do_huge_pmd_anonymous_page.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