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 /include/linux/reservation.h | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
parent | mutex: Move ww_mutex definitions to ww_mutex.h (diff) | |
download | linux-dev-4fa109b13042868de84bedc70ea9b8337b502cf9.tar.xz linux-dev-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 'include/linux/reservation.h')
-rw-r--r-- | include/linux/reservation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/reservation.h b/include/linux/reservation.h index e9ee806a9d72..813dae960ebd 100644 --- a/include/linux/reservation.h +++ b/include/linux/reservation.h @@ -39,7 +39,7 @@ #ifndef _LINUX_RESERVATION_H #define _LINUX_RESERVATION_H -#include <linux/mutex.h> +#include <linux/ww_mutex.h> extern struct ww_class reservation_ww_class; |