diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 15:35:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 15:35:12 -0700 |
| commit | 4fa109b13042868de84bedc70ea9b8337b502cf9 (patch) | |
| tree | e82ebb56e8b9316d5d7e3561523db0c8bcd42946 /lib | |
| parent | 9663398a094e3b85415e27fe6047b067f5f81f99 (diff) | |
| parent | 1b375dc30710180c4b88cc59caba6e3481ec5c8b (diff) | |
| download | linux-4fa109b13042868de84bedc70ea9b8337b502cf9.tar.gz linux-4fa109b13042868de84bedc70ea9b8337b502cf9.tar.bz2 linux-4fa109b13042868de84bedc70ea9b8337b502cf9.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking updates from Thomas Gleixner:
"Header cleanup as requested by Linus"
(This is the "don't include support for ww_mutex in a header file that
everybody wants, when almost nobody wants the ww part" change)
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mutex: Move ww_mutex definitions to ww_mutex.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/locking-selftest.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index aad024dde3c4..6dc09d8f4c24 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -12,6 +12,7 @@ */ #include <linux/rwsem.h> #include <linux/mutex.h> +#include <linux/ww_mutex.h> #include <linux/sched.h> #include <linux/delay.h> #include <linux/lockdep.h> |