From 0f169cbb79c39a5b15f7a27d9283cdeb6e122b8f Mon Sep 17 00:00:00 2001 From: rofl0r Date: Sat, 11 Jan 2014 13:41:50 +0100 Subject: sys/shm.h: move arch specific structs to bits/ --- arch/arm/bits/shm.h | 11 +++++++++++ arch/i386/bits/shm.h | 11 +++++++++++ arch/microblaze/bits/shm.h | 11 +++++++++++ arch/mips/bits/shm.h | 11 +++++++++++ arch/powerpc/bits/shm.h | 11 +++++++++++ arch/x86_64/bits/shm.h | 11 +++++++++++ include/sys/shm.h | 23 +++++++---------------- 7 files changed, 73 insertions(+), 16 deletions(-) diff --git a/arch/arm/bits/shm.h b/arch/arm/bits/shm.h index 8807c4fb..547581f1 100644 --- a/arch/arm/bits/shm.h +++ b/arch/arm/bits/shm.h @@ -16,3 +16,14 @@ struct shmid_ds 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 index 8807c4fb..547581f1 100644 --- a/arch/i386/bits/shm.h +++ b/arch/i386/bits/shm.h @@ -16,3 +16,14 @@ struct shmid_ds 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 index 8807c4fb..547581f1 100644 --- a/arch/microblaze/bits/shm.h +++ b/arch/microblaze/bits/shm.h @@ -16,3 +16,14 @@ struct shmid_ds 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/mips/bits/shm.h b/arch/mips/bits/shm.h index abf1d506..f4b87126 100644 --- a/arch/mips/bits/shm.h +++ b/arch/mips/bits/shm.h @@ -13,3 +13,14 @@ struct shmid_ds 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/powerpc/bits/shm.h b/arch/powerpc/bits/shm.h index 8807c4fb..547581f1 100644 --- a/arch/powerpc/bits/shm.h +++ b/arch/powerpc/bits/shm.h @@ -16,3 +16,14 @@ struct shmid_ds 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/x86_64/bits/shm.h b/arch/x86_64/bits/shm.h index abf1d506..f4b87126 100644 --- a/arch/x86_64/bits/shm.h +++ b/arch/x86_64/bits/shm.h @@ -13,3 +13,14 @@ struct shmid_ds 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/include/sys/shm.h b/include/sys/shm.h index d97e582c..67be822b 100644 --- a/include/sys/shm.h +++ b/include/sys/shm.h @@ -14,6 +14,13 @@ extern "C" { #include #include + +#ifdef _GNU_SOURCE +#define __used_ids used_ids +#define __swap_attempts swap_attempts +#define __swap_successes swap_successes +#endif + #include #define SHM_R 0400 @@ -33,22 +40,6 @@ extern "C" { #define SHM_HUGETLB 04000 #define SHM_NORESERVE 010000 -struct shminfo { - unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4]; -}; - -#ifdef _GNU_SOURCE -#define __used_ids used_ids -#define __swap_attempts swap_attempts -#define __swap_successes swap_successes -#endif - -struct shm_info { - int __used_ids; - unsigned long shm_tot, shm_rss, shm_swp; - unsigned long __swap_attempts, __swap_successes; -}; - typedef unsigned long shmatt_t; void *shmat(int, const void *, int); -- cgit v1.2.1