y2038: sparc: Extend sysvipc data structures
sparc, uses a nonstandard variation of the generic sysvipc data structures, intended to have the padding moved around so it can deal with big-endian 32-bit user space that has 64-bit time_t. Unlike most architectures, sparc actually succeeded in defining this right for big-endian CPUs, but as everyone else got it wrong, we just use the same hack everywhere. This takes just take the same approach here that we have for the asm-generic headers and adds separate 32-bit fields for the upper halves of the timestamps, to let libc deal with the mess in user space. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -8,25 +8,22 @@
|
||||
* between kernel and user space.
|
||||
*
|
||||
* Pad space is left for:
|
||||
* - 64-bit time_t to solve y2038 problem
|
||||
* - 2 miscellaneous 32-bit values
|
||||
*/
|
||||
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
# define PADDING(x)
|
||||
#else
|
||||
# define PADDING(x) unsigned int x;
|
||||
#endif
|
||||
|
||||
|
||||
struct msqid64_ds {
|
||||
struct ipc64_perm msg_perm;
|
||||
PADDING(__pad1)
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
__kernel_time_t msg_stime; /* last msgsnd time */
|
||||
PADDING(__pad2)
|
||||
__kernel_time_t msg_rtime; /* last msgrcv time */
|
||||
PADDING(__pad3)
|
||||
__kernel_time_t msg_ctime; /* last change time */
|
||||
#else
|
||||
unsigned long msg_stime_high;
|
||||
unsigned long msg_stime; /* last msgsnd time */
|
||||
unsigned long msg_rtime_high;
|
||||
unsigned long msg_rtime; /* last msgrcv time */
|
||||
unsigned long msg_ctime_high;
|
||||
unsigned long msg_ctime; /* last change time */
|
||||
#endif
|
||||
unsigned long msg_cbytes; /* current number of bytes on queue */
|
||||
unsigned long msg_qnum; /* number of messages in queue */
|
||||
unsigned long msg_qbytes; /* max number of bytes on queue */
|
||||
@@ -35,5 +32,4 @@ struct msqid64_ds {
|
||||
unsigned long __unused1;
|
||||
unsigned long __unused2;
|
||||
};
|
||||
#undef PADDING
|
||||
#endif /* _SPARC_MSGBUF_H */
|
||||
|
Reference in New Issue
Block a user