The patch titled lock validator: special locking in serio has been added to the -mm tree. Its filename is lock-validator-special-locking-serio.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: lock validator: special locking in serio From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> The PS/2 code has a natural device order and there is a one level recursion in this device order in terms of the cmd_mutex; annotate this explicit recursion as ok Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Cc: Dmitry Torokhov <dtor_core@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/input/serio/libps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/input/serio/libps2.c~lock-validator-special-locking-serio drivers/input/serio/libps2.c --- devel/drivers/input/serio/libps2.c~lock-validator-special-locking-serio 2006-06-03 02:02:01.000000000 -0700 +++ devel-akpm/drivers/input/serio/libps2.c 2006-06-03 02:02:01.000000000 -0700 @@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, u return -1; } - mutex_lock(&ps2dev->cmd_mutex); + mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING); serio_pause_rx(ps2dev->serio); ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0; _ Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are git-netdev-all.patch lock-validator-lockdep-small-xfs-init_rwsem-cleanup.patch add-export_unused_symbol-and-export_unused_symbol_gpl.patch add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch spin-rwlock-init-cleanups.patch lock-validator-introduce-warn_on_oncecond.patch emu10k1-mark-midi_spinlock-as-used.patch epoll-use-unlocked-wqueue-operations.patch pi-futex-futex-code-cleanups.patch pi-futex-introduce-debug_check_no_locks_freed.patch pi-futex-add-plist-implementation.patch pi-futex-scheduler-support-for-pi.patch pi-futex-rt-mutex-core.patch pi-futex-rt-mutex-docs.patch pi-futex-rt-mutex-debug.patch pi-futex-rt-mutex-tester.patch pi-futex-rt-mutex-futex-api.patch pi-futex-futex_lock_pi-futex_unlock_pi-support.patch lock-validator-floppyc-irq-release-fix.patch lock-validator-forcedethc-fix.patch lock-validator-mutex-section-binutils-workaround.patch lock-validator-add-__module_address-method.patch lock-validator-better-lock-debugging.patch lock-validator-locking-api-self-tests.patch lock-validator-locking-api-self-tests-self-test-fix.patch lock-validator-locking-init-debugging-improvement.patch lock-validator-beautify-x86_64-stacktraces.patch lock-validator-beautify-x86_64-stacktraces-fix.patch lock-validator-x86_64-document-stack-frame-internals.patch lock-validator-stacktrace.patch lock-validator-stacktrace-build-fix.patch lock-validator-stacktrace-warning-fix.patch lock-validator-stacktrace-fix-on-x86_64.patch lock-validator-fown-locking-workaround.patch lock-validator-sk_callback_lock-workaround.patch lock-validator-irqtrace-core.patch lock-validator-irqtrace-core-powerpc-fix-1.patch lock-validator-irqtrace-core-non-x86-fix.patch lock-validator-irqtrace-core-non-x86-fix-2.patch lock-validator-irqtrace-core-non-x86-fix-3.patch lock-validator-irqtrace-entrys-fix.patch lock-validator-irqtrace-core-remove-softirqc-warn_on.patch lock-validator-irqtrace-cleanup-include-asm-i386-irqflagsh.patch lock-validator-irqtrace-cleanup-include-asm-x86_64-irqflagsh.patch lock-validator-lockdep-add-local_irq_enable_in_hardirq-api.patch lock-validator-add-per_cpu_offset.patch lock-validator-add-per_cpu_offset-fix.patch lock-validator-core.patch lock-validator-procfs.patch lock-validator-core-multichar-fix.patch lock-validator-core-count_matching_names-fix.patch lock-validator-design-docs.patch lock-validator-prove-rwsem-locking-correctness.patch lock-validator-prove-rwsem-locking-correctness-fix.patch lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch lock-validator-prove-spinlock-rwlock-locking-correctness.patch lock-validator-prove-mutex-locking-correctness.patch lock-validator-prove-mutex-locking-correctness-fix-null-type-name-bug.patch lock-validator-print-all-lock-types-on-sysrq-d.patch lock-validator-x86_64-early-init.patch lock-validator-smp-alternatives-workaround.patch lock-validator-do-not-recurse-in-printk.patch lock-validator-disable-nmi-watchdog-if-config_lockdep.patch lock-validator-disable-nmi-watchdog-if-config_lockdep-i386.patch lock-validator-disable-nmi-watchdog-if-config_lockdep-x86_64.patch lock-validator-special-locking-bdev.patch lock-validator-special-locking-direct-io.patch lock-validator-special-locking-serial.patch lock-validator-special-locking-serial-fix.patch lock-validator-special-locking-dcache.patch lock-validator-special-locking-i_mutex.patch lock-validator-special-locking-s_lock.patch lock-validator-special-locking-futex.patch lock-validator-special-locking-genirq.patch lock-validator-special-locking-completions.patch lock-validator-special-locking-waitqueues.patch lock-validator-special-locking-mm.patch lock-validator-special-locking-serio.patch lock-validator-special-locking-slab.patch lock-validator-special-locking-skb_queue_head_init.patch lock-validator-special-locking-net-ipv4-igmpcpatch.patch lock-validator-special-locking-timerc.patch lock-validator-special-locking-schedc.patch lock-validator-special-locking-hrtimerc.patch lock-validator-special-locking-sock_lock_init.patch lock-validator-special-locking-af_unix.patch lock-validator-special-locking-bh_lock_sock.patch lock-validator-special-locking-mmap_sem.patch lock-validator-special-locking-sb-s_umount.patch lock-validator-special-locking-sb-s_umount-fix.patch lock-validator-special-locking-sb-s_umount-2.patch lock-validator-special-locking-sb-s_umount-2-fix.patch lockdep-annotate-rpc_populate-for.patch lock-validator-special-locking-jbd.patch lock-validator-special-locking-posix-timers.patch lock-validator-special-locking-sch_genericc.patch lock-validator-special-locking-xfrm.patch lockdep-add-i_mutex-ordering-annotations-to-the-sunrpc.patch lockdep-add-parent-child-annotations-to-usbfs.patch lock-validator-special-locking-sound-core-seq-seq_portsc.patch lock-validator-special-locking-sound-core-seq-seq_devicec.patch lock-validator-fix-rt_hash_lock_sz.patch lock-validator-introduce-irq__lockdep.patch locking-validator-special-rule-8390c-disable_irq.patch locking-validator-special-rule-3c59xc-disable_irq.patch lock-validator-enable-lock-validator-in-kconfig.patch lock-validator-enable-lock-validator-in-kconfig-require-trace_irqflags_support.patch lock-validator-enable-lock-validator-in-kconfig-not-yet.patch lockdep-one-stacktrace-column-if-config_lockdep=y.patch lockdep-further-improve-stacktrace-output.patch lock-validator-disable-oprofile-if-lockdep=y.patch lock-validator-special-locking-kgdb.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