The patch titled kprobes: use hlist_for_each_entry has been added to the -mm tree. Its filename is kprobes-use-hlist_for_each_entry.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: kprobes: use hlist_for_each_entry From: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Cc: Prasanna S Panchamukhi <prasanna@xxxxxxxxxx> Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/kprobes.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN kernel/kprobes.c~kprobes-use-hlist_for_each_entry kernel/kprobes.c --- a/kernel/kprobes.c~kprobes-use-hlist_for_each_entry +++ a/kernel/kprobes.c @@ -134,8 +134,7 @@ kprobe_opcode_t __kprobes *get_insn_slot struct hlist_node *pos; retry: - hlist_for_each(pos, &kprobe_insn_pages) { - kip = hlist_entry(pos, struct kprobe_insn_page, hlist); + hlist_for_each_entry(kip, pos, &kprobe_insn_pages, hlist) { if (kip->nused < INSNS_PER_PAGE) { int i; for (i = 0; i < INSNS_PER_PAGE; i++) { @@ -214,9 +213,8 @@ static int __kprobes collect_garbage_slo if (check_safety() != 0) return -EAGAIN; - hlist_for_each_safe(pos, next, &kprobe_insn_pages) { + hlist_for_each_entry_safe(kip, pos, next, &kprobe_insn_pages, hlist) { int i; - kip = hlist_entry(pos, struct kprobe_insn_page, hlist); if (kip->ngarbage == 0) continue; kip->ngarbage = 0; /* we will collect all garbages */ @@ -235,8 +233,7 @@ void __kprobes free_insn_slot(kprobe_opc struct kprobe_insn_page *kip; struct hlist_node *pos; - hlist_for_each(pos, &kprobe_insn_pages) { - kip = hlist_entry(pos, struct kprobe_insn_page, hlist); + hlist_for_each_entry(kip, pos, &kprobe_insn_pages, hlist) { if (kip->insns <= slot && slot < kip->insns + (INSNS_PER_PAGE * MAX_INSN_SIZE)) { int i = (slot - kip->insns) / MAX_INSN_SIZE; _ Patches currently in -mm which might be from hch@xxxxxx are cifs-remove-unneeded-checks.patch mm-move-common-segment-checks-to-separate-helper-function-v7.patch mm-move-common-segment-checks-to-separate-helper-function-v7-tidy.patch simplify-the-stacktrace-code.patch allow-access-to-proc-pid-fd-after-setuid.patch fix-quadratic-behavior-of-shrink_dcache_parent.patch freevxfs-possible-null-pointer-dereference-fix.patch vfs-remove-superflous-sb-==-null-checks.patch nameic-remove-utterly-outdated-comment.patch move-die-notifier-handling-to-common-code.patch move-die-notifier-handling-to-common-code-fixes.patch move-die-notifier-handling-to-common-code-fixes-2.patch move-die-notifier-handling-to-common-code-fix-vmalloc_sync_all.patch turn-do_sync_file_range-into-do_sync_mapping_range.patch remove-do_sync_file_range.patch make-static-counters-in-new_inode-and-iunique-be-32-bits.patch change-libfs-sb-creation-routines-to-avoid-collisions-with-their-root-inodes.patch aio-is-unlikely.patch kprobes-use-hlist_for_each_entry.patch kprobes-codingstyle-cleanups.patch kprobes-kretprobes-simplifcations.patch revoke-special-mmap-handling.patch revoke-core-code.patch revoke-support-for-ext2-and-ext3.patch revoke-add-documentation.patch revoke-wire-up-i386-system-calls.patch ps3fb-thread-updates.patch ps3av-thread-updates.patch ps3fb-kill-superfluous-zero-initializations.patch ps3av-misc-updates.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