diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 16:37:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 16:37:24 -0400 |
| commit | 079091a450ed5a0001c2ee9dadd8ddaceddb91b5 (patch) | |
| tree | 38f08cadd02fc5cff5718d2615ad586329c432f6 /include/asm-x86/shmbuf.h | |
| parent | 8fc37f2c474b8ea61186fd77193324845432447b (diff) | |
x86: merge shmbuf_32/64.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/shmbuf.h')
| -rw-r--r-- | include/asm-x86/shmbuf.h | 62 |
1 files changed, 50 insertions, 12 deletions
diff --git a/include/asm-x86/shmbuf.h b/include/asm-x86/shmbuf.h index e85f1cb11217..b51413b74971 100644 --- a/include/asm-x86/shmbuf.h +++ b/include/asm-x86/shmbuf.h | |||
| @@ -1,13 +1,51 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifndef _ASM_X86_SHMBUF_H |
| 2 | # ifdef CONFIG_X86_32 | 2 | #define _ASM_X86_SHMBUF_H |
| 3 | # include "shmbuf_32.h" | 3 | |
| 4 | # else | 4 | /* |
| 5 | # include "shmbuf_64.h" | 5 | * The shmid64_ds structure for x86 architecture. |
| 6 | # endif | 6 | * Note extra padding because this structure is passed back and forth |
| 7 | #else | 7 | * between kernel and user space. |
| 8 | # ifdef __i386__ | 8 | * |
| 9 | # include "shmbuf_32.h" | 9 | * Pad space on 32 bit is left for: |
| 10 | # else | 10 | * - 64-bit time_t to solve y2038 problem |
| 11 | # include "shmbuf_64.h" | 11 | * - 2 miscellaneous 32-bit values |
| 12 | # endif | 12 | * |
| 13 | * Pad space on 64 bit is left for: | ||
| 14 | * - 2 miscellaneous 64-bit values | ||
| 15 | */ | ||
| 16 | |||
| 17 | struct shmid64_ds { | ||
| 18 | struct ipc64_perm shm_perm; /* operation perms */ | ||
| 19 | size_t shm_segsz; /* size of segment (bytes) */ | ||
| 20 | __kernel_time_t shm_atime; /* last attach time */ | ||
| 21 | #ifdef __i386__ | ||
| 22 | unsigned long __unused1; | ||
| 13 | #endif | 23 | #endif |
| 24 | __kernel_time_t shm_dtime; /* last detach time */ | ||
| 25 | #ifdef __i386__ | ||
| 26 | unsigned long __unused2; | ||
| 27 | #endif | ||
| 28 | __kernel_time_t shm_ctime; /* last change time */ | ||
| 29 | #ifdef __i386__ | ||
| 30 | unsigned long __unused3; | ||
| 31 | #endif | ||
| 32 | __kernel_pid_t shm_cpid; /* pid of creator */ | ||
| 33 | __kernel_pid_t shm_lpid; /* pid of last operator */ | ||
| 34 | unsigned long shm_nattch; /* no. of current attaches */ | ||
| 35 | unsigned long __unused4; | ||
| 36 | unsigned long __unused5; | ||
| 37 | }; | ||
| 38 | |||
| 39 | struct shminfo64 { | ||
| 40 | unsigned long shmmax; | ||
| 41 | unsigned long shmmin; | ||
| 42 | unsigned long shmmni; | ||
| 43 | unsigned long shmseg; | ||
| 44 | unsigned long shmall; | ||
| 45 | unsigned long __unused1; | ||
| 46 | unsigned long __unused2; | ||
| 47 | unsigned long __unused3; | ||
| 48 | unsigned long __unused4; | ||
| 49 | }; | ||
| 50 | |||
| 51 | #endif /* _ASM_X86_SHMBUF_H */ | ||