Add mutex_lock_nested, mutex_unlock_nested and mutex_is_locked to
include/linux/mutex.h and remove them from UBIFS.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
fs/ubifs/ubifs.h | 3 ---
include/linux/mutex.h | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index d4df668ca6..d11f213c06 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -84,9 +84,6 @@ struct page {
#define module_param_named(...)
/* misc.h */
-#define mutex_lock_nested(...)
-#define mutex_unlock_nested(...)
-#define mutex_is_locked(...) 0
#endif
/* Version of this UBIFS implementation */
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index a84085cab2..de698dbc4f 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -13,6 +13,9 @@
#define mutex_init(...)
#define mutex_lock(...)
#define mutex_unlock(...)
+#define mutex_lock_nested(...)
+#define mutex_unlock_nested(...)
+#define mutex_is_locked(...) 0
struct mutex { int i; };
#endif /* __LINUX_MUTEX_H */
--
2.19.0
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
