From 6ed37ccd31987c7f4fdd457101c5342e64431cd5 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 29 Jul 2019 15:39:24 -0400 Subject: [PATCH] duplicate generic bits/shm.h for each arch using it, in prep to change there are more archs sharing the generic 64-bit version of the struct, which is uniform and much more reasonable, than sharing the current "generic" one, and depending on how time64 sysvipc is done for 32-bit archs, even more may be sharing the "64-bit version" in the future. so, duplicate the current generic to all archs using it (arm, i386, m68k, microblaze, or1k) so that the generic can be changed freely. this is recorded as its own commit mainly as a hint to git tooling, to assist in copy/move tracking. --- arch/arm/bits/shm.h | 28 ++++++++++++++++++++++++++++ arch/i386/bits/shm.h | 28 ++++++++++++++++++++++++++++ arch/m68k/bits/shm.h | 28 ++++++++++++++++++++++++++++ arch/microblaze/bits/shm.h | 28 ++++++++++++++++++++++++++++ arch/or1k/bits/shm.h | 28 ++++++++++++++++++++++++++++ 5 files changed, 140 insertions(+) create mode 100644 arch/arm/bits/shm.h create mode 100644 arch/i386/bits/shm.h create mode 100644 arch/m68k/bits/shm.h create mode 100644 arch/microblaze/bits/shm.h create mode 100644 arch/or1k/bits/shm.h diff --git a/arch/arm/bits/shm.h b/arch/arm/bits/shm.h new file mode 100644 index 00000000..45d1d157 --- /dev/null +++ b/arch/arm/bits/shm.h @@ -0,0 +1,28 @@ +#define SHMLBA 4096 + +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + time_t shm_atime; + int __unused1; + time_t shm_dtime; + int __unused2; + time_t shm_ctime; + int __unused3; + pid_t shm_cpid; + pid_t shm_lpid; + unsigned long shm_nattch; + unsigned long __pad1; + unsigned long __pad2; +}; + +struct shminfo { + unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; +}; + +struct shm_info { + int __used_ids; + unsigned long shm_tot, shm_rss, shm_swp; + unsigned long __swap_attempts, __swap_successes; +}; + diff --git a/arch/i386/bits/shm.h b/arch/i386/bits/shm.h new file mode 100644 index 00000000..45d1d157 --- /dev/null +++ b/arch/i386/bits/shm.h @@ -0,0 +1,28 @@ +#define SHMLBA 4096 + +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + time_t shm_atime; + int __unused1; + time_t shm_dtime; + int __unused2; + time_t shm_ctime; + int __unused3; + pid_t shm_cpid; + pid_t shm_lpid; + unsigned long shm_nattch; + unsigned long __pad1; + unsigned long __pad2; +}; + +struct shminfo { + unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; +}; + +struct shm_info { + int __used_ids; + unsigned long shm_tot, shm_rss, shm_swp; + unsigned long __swap_attempts, __swap_successes; +}; + diff --git a/arch/m68k/bits/shm.h b/arch/m68k/bits/shm.h new file mode 100644 index 00000000..45d1d157 --- /dev/null +++ b/arch/m68k/bits/shm.h @@ -0,0 +1,28 @@ +#define SHMLBA 4096 + +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + time_t shm_atime; + int __unused1; + time_t shm_dtime; + int __unused2; + time_t shm_ctime; + int __unused3; + pid_t shm_cpid; + pid_t shm_lpid; + unsigned long shm_nattch; + unsigned long __pad1; + unsigned long __pad2; +}; + +struct shminfo { + unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; +}; + +struct shm_info { + int __used_ids; + unsigned long shm_tot, shm_rss, shm_swp; + unsigned long __swap_attempts, __swap_successes; +}; + diff --git a/arch/microblaze/bits/shm.h b/arch/microblaze/bits/shm.h new file mode 100644 index 00000000..45d1d157 --- /dev/null +++ b/arch/microblaze/bits/shm.h @@ -0,0 +1,28 @@ +#define SHMLBA 4096 + +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + time_t shm_atime; + int __unused1; + time_t shm_dtime; + int __unused2; + time_t shm_ctime; + int __unused3; + pid_t shm_cpid; + pid_t shm_lpid; + unsigned long shm_nattch; + unsigned long __pad1; + unsigned long __pad2; +}; + +struct shminfo { + unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; +}; + +struct shm_info { + int __used_ids; + unsigned long shm_tot, shm_rss, shm_swp; + unsigned long __swap_attempts, __swap_successes; +}; + diff --git a/arch/or1k/bits/shm.h b/arch/or1k/bits/shm.h new file mode 100644 index 00000000..45d1d157 --- /dev/null +++ b/arch/or1k/bits/shm.h @@ -0,0 +1,28 @@ +#define SHMLBA 4096 + +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + time_t shm_atime; + int __unused1; + time_t shm_dtime; + int __unused2; + time_t shm_ctime; + int __unused3; + pid_t shm_cpid; + pid_t shm_lpid; + unsigned long shm_nattch; + unsigned long __pad1; + unsigned long __pad2; +}; + +struct shminfo { + unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; +}; + +struct shm_info { + int __used_ids; + unsigned long shm_tot, shm_rss, shm_swp; + unsigned long __swap_attempts, __swap_successes; +}; + -- 2.25.1