diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 18:35:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 18:35:12 -0400 |
| commit | 4fa109b13042868de84bedc70ea9b8337b502cf9 (patch) | |
| tree | e82ebb56e8b9316d5d7e3561523db0c8bcd42946 /kernel | |
| parent | 9663398a094e3b85415e27fe6047b067f5f81f99 (diff) | |
| parent | 1b375dc30710180c4b88cc59caba6e3481ec5c8b (diff) | |
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 'kernel')
| -rw-r--r-- | kernel/mutex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index e581ada5faf4..ff05f4bd86eb 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * Also see Documentation/mutex-design.txt. | 18 | * Also see Documentation/mutex-design.txt. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 21 | #include <linux/ww_mutex.h> | ||
| 21 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 22 | #include <linux/sched/rt.h> | 23 | #include <linux/sched/rt.h> |
| 23 | #include <linux/export.h> | 24 | #include <linux/export.h> |