projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffsfs.c: Fix NULL dereference in yaffs_unmount2_reldev()
[yaffs2.git]
/
yportenv_multi.h
diff --git
a/yportenv_multi.h
b/yportenv_multi.h
index 3df7d566ebf5a084e68caf7e1181cbbb9dcc6141..fa5601b82bba915f6806841dc9a555f0620bf30d 100644
(file)
--- a/
yportenv_multi.h
+++ b/
yportenv_multi.h
@@
-53,6
+53,8
@@
#define YUCHAR unsigned char
#define _Y(x) x
#define YUCHAR unsigned char
#define _Y(x) x
+#define YTIME_T u64
+
#define YAFFS_LOSTNFOUND_NAME "lost+found"
#define YAFFS_LOSTNFOUND_PREFIX "obj"
#define YAFFS_LOSTNFOUND_NAME "lost+found"
#define YAFFS_LOSTNFOUND_PREFIX "obj"
@@
-61,10
+63,18
@@
#define YAFFS_LOSTNFOUND_MODE 0700
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
#define YAFFS_LOSTNFOUND_MODE 0700
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
+#else
+#define Y_CURRENT_TIME current_kernel_time().tv_sec
+#endif
#define Y_TIME_CONVERT(x) (x).tv_sec
#else
#define Y_TIME_CONVERT(x) (x).tv_sec
#else
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
#define Y_CURRENT_TIME CURRENT_TIME
#define Y_CURRENT_TIME CURRENT_TIME
+#else
+#define Y_CURRENT_TIME current_kernel_time()
+#endif
#define Y_TIME_CONVERT(x) (x)
#endif
#define Y_TIME_CONVERT(x) (x)
#endif