The patch titled uml: remove debugging remnants has been added to the -mm tree. Its filename is uml-remove-debugging-remnants.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: remove debugging remnants From: Jeff Dike <jdike@xxxxxxxxxxx> I accidentally left the remnants of some debugging in an earlier patch. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/kernel/tlb.c | 3 --- 1 files changed, 3 deletions(-) diff -puN arch/um/kernel/tlb.c~uml-remove-debugging-remnants arch/um/kernel/tlb.c --- a/arch/um/kernel/tlb.c~uml-remove-debugging-remnants +++ a/arch/um/kernel/tlb.c @@ -235,9 +235,7 @@ void fix_range_common(struct mm_struct * unsigned long addr = start_addr, next; int ret = 0, last_op = ARRAY_SIZE(ops) - 1, op_index = -1; void *flush = NULL; - unsigned long long start_time, end_time; - start_time = os_nsecs(); ops[0].type = NONE; pgd = pgd_offset(mm, addr); do { @@ -254,7 +252,6 @@ void fix_range_common(struct mm_struct * &op_index, force, mmu, &flush, do_ops); } while (pgd++, addr = next, ((addr != end_addr) && !ret)); - end_time = os_nsecs(); log_info("total flush time - %Ld nsecs\n", end_time - start_time); if(!ret) _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are uml-delete-unused-code.patch uml-formatting-fixes.patch uml-host_info-tidying.patch uml-mark-tt-mode-code-for-future-removal.patch uml-print-coredump-limits.patch uml-handle-block-device-hotplug-errors.patch uml-driver-formatting-fixes.patch uml-driver-formatting-fixes-fix.patch uml-network-interface-hotplug-error-handling.patch array_size-check-for-type-uml-fix.patch uml-fix-prototypes.patch uml-move-sigio-testing-to-sigioc.patch uml-create-archh.patch uml-create-as-layouth.patch uml-move-remaining-useful-contents-of-user_utilh.patch uml-remove-user_utilh.patch uml-add-missing-__init-declarations.patch remove-unused-header-file-arch-um-kernel-tt-include-mode_kern-tth.patch uml-speed-up-exec.patch uml-no-locking-needed-in-tlsc.patch uml-tidy-processc.patch uml-tidy-processc-fix.patch uml-remove-page_size.patch uml-kernel_thread-shouldnt-panic.patch uml-tidy-fault-code.patch uml-kernel-segfaults-should-dump-proper-registers.patch uml-comment-early-boot-locking.patch uml-irq-locking-commentary.patch uml-delete-host_frame_size.patch uml-drivers-get-release-methods.patch uml-dump-registers-on-ptrace-or-wait-failure.patch uml-speed-up-page-table-walking.patch uml-remove-unused-x86_64-code.patch uml-start-fixing-os_read_file-and-os_write_file.patch uml-tidy-libc-code.patch uml-convert-libc-layer-to-call-read-and-write.patch uml-batch-i-o-requests.patch uml-send-pointers-instead-of-structures-to-i-o-thread.patch uml-dump-core-on-panic.patch uml-dont-try-to-handle-signals-on-initial-process-stack.patch uml-change-remaining-callers-of-os_read_write_file.patch uml-formatting-fixes-around-os_read_write_file-callers.patch uml-remove-debugging-remnants.patch uml-rename-os_read_write_file_k-back-to-os_read_write_file.patch uml-aio-deadlock-avoidance.patch uml-speed-page-fault-path.patch sys_futex64-allows-64bit-futexes-workaround-for-uml.patch utrace-uml-make-uml-compile-with-utrace-enabled.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