The patch titled timer: add lock annotation to lock_timer_base has been added to the -mm tree. Its filename is timer-add-lock-annotation-to-lock_timer_base.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: timer: add lock annotation to lock_timer_base From: Josh Triplett <josht@xxxxxxxxxx> lock_timer_base acquires a lock and returns with that lock held. Add a lock annotation to this function so that sparse can check callers for lock pairing, and so that sparse will not complain about this function since it intentionally uses the lock in this manner. Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/timer.c | 1 + 1 file changed, 1 insertion(+) diff -puN kernel/timer.c~timer-add-lock-annotation-to-lock_timer_base kernel/timer.c --- a/kernel/timer.c~timer-add-lock-annotation-to-lock_timer_base +++ a/kernel/timer.c @@ -175,6 +175,7 @@ static inline void detach_timer(struct t */ static tvec_base_t *lock_timer_base(struct timer_list *timer, unsigned long *flags) + __acquires(timer->base->lock) { tvec_base_t *base; _ Patches currently in -mm which might be from josht@xxxxxxxxxx are git-nfs.patch xfs-add-lock-annotations-to-xfs_trans_update_ail-and-xfs_trans_delete_ail.patch remove-incorrect-unlock_kernel-from-allocation.patch remove-incorrect-unlock_kernel-from-failure-path-in.patch add-entry-for-efs-filesystem-to-maintainers-as-orphan.patch ufs-remove-incorrect-unlock_kernel-from-failure-path-in-ufs_symlink.patch efi-add-lock-annotations-for-efi_call_phys_prelog-and-efi_call_phys_epilog.patch mbcache-add-lock-annotation-for-__mb_cache_entry_release_unlock.patch afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch fuse-add-lock-annotations-to-request_end-and-fuse_read_interrupt.patch hugetlbfs-add-lock-annotation-to-hugetlbfs_forget_inode.patch jbd-add-lock-annotation-to-jbd_sync_bh.patch fix-typo-in-maintainers-s-devics-devices.patch fs-add-lock-annotation-to-grab_super.patch rcu-add-lock-annotations-to-rcu_bh_torture_read_lockunlock.patch freevxfs-add-missing-lock_kernel-to-vxfs_readdir.patch timer-fix-tvec_bases-initializer.patch timer-add-lock-annotation-to-lock_timer_base.patch nfsd-add-lock-annotations-to-e_start-and-e_stop.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