diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-05 23:19:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-04-20 16:20:13 +0200 |
| commit | d0b67de998025210c31bbceb79739df8e28a3d4f (patch) | |
| tree | c64c8ae40810dc4f543707469b897d3902c91678 /arch/powerpc/include/uapi/asm/msgbuf.h | |
| parent | 91b9b0d71879eba67c93edd05e94bd3e28e1f199 (diff) | |
| download | linux-d0b67de998025210c31bbceb79739df8e28a3d4f.tar.gz | |
y2038: powerpc: Extend sysvipc data structures
powerpc, 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.
powerpc has the same definition as parisc and sparc, but now also
supports little-endian mode, which is now wrong because the
padding is made for big-endian user space.
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>
Diffstat (limited to 'arch/powerpc/include/uapi/asm/msgbuf.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/msgbuf.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/include/uapi/asm/msgbuf.h b/arch/powerpc/include/uapi/asm/msgbuf.h index 65beb0942500..2b1b37797a47 100644 --- a/arch/powerpc/include/uapi/asm/msgbuf.h +++ b/arch/powerpc/include/uapi/asm/msgbuf.h @@ -10,18 +10,18 @@ struct msqid64_ds { struct ipc64_perm msg_perm; -#ifndef __powerpc64__ - unsigned int __unused1; -#endif +#ifdef __powerpc64__ __kernel_time_t msg_stime; /* last msgsnd time */ -#ifndef __powerpc64__ - unsigned int __unused2; -#endif __kernel_time_t msg_rtime; /* last msgrcv time */ -#ifndef __powerpc64__ - unsigned int __unused3; -#endif __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 */ |