export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/include/uapi/asm-generic/msgbuf.h
..
..
@@ -3,6 +3,8 @@
3
3
 #define __ASM_GENERIC_MSGBUF_H
4
4
 
5
5
 #include <asm/bitsperlong.h>
6
+#include <asm/ipcbuf.h>
7
+
6
8
 /*
7
9
  * generic msqid64_ds structure.
8
10
  *
..
..
@@ -13,9 +15,9 @@
13
15
  * everyone just ended up making identical copies without specific
14
16
  * optimizations, so we may just as well all use the same one.
15
17
  *
16
- * 64 bit architectures typically define a 64 bit __kernel_time_t,
17
- * so they do not need the first three padding words.
18
- * On big-endian systems, the padding is in the wrong place.
18
+ * 64 bit architectures use a 64-bit long time field here, while
19
+ * 32 bit architectures have a pair of unsigned long values.
20
+ * On big-endian systems, the lower half is in the wrong place.
19
21
  *
20
22
  * Pad space is left for:
21
23
  * - 2 miscellaneous 32-bit values
..
..
@@ -24,9 +26,9 @@
24
26
 struct msqid64_ds {
25
27
 	struct ipc64_perm msg_perm;
26
28
 #if __BITS_PER_LONG == 64
27
-	__kernel_time_t msg_stime;	/* last msgsnd time */
28
-	__kernel_time_t msg_rtime;	/* last msgrcv time */
29
-	__kernel_time_t msg_ctime;	/* last change time */
29
+	long		 msg_stime;	/* last msgsnd time */
30
+	long		 msg_rtime;	/* last msgrcv time */
31
+	long		 msg_ctime;	/* last change time */
30
32
 #else
31
33
 	unsigned long	msg_stime;	/* last msgsnd time */
32
34
 	unsigned long	msg_stime_high;