diff options
author | 2008-08-01 14:59:11 -0700 | |
---|---|---|
committer | 2008-08-01 14:59:11 -0700 | |
commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /include/asm-ia64/shmbuf.h | |
parent | embedded: fix vc_translate operator precedence (diff) | |
parent | [IA64] Move include/asm-ia64 to arch/ia64/include/asm (diff) | |
download | linux-dev-2b12a4c524812fb3f6ee590a02e65b95c8c32229.tar.xz linux-dev-2b12a4c524812fb3f6ee590a02e65b95c8c32229.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'include/asm-ia64/shmbuf.h')
-rw-r--r-- | include/asm-ia64/shmbuf.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/include/asm-ia64/shmbuf.h b/include/asm-ia64/shmbuf.h deleted file mode 100644 index 585002a77acd..000000000000 --- a/include/asm-ia64/shmbuf.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _ASM_IA64_SHMBUF_H -#define _ASM_IA64_SHMBUF_H - -/* - * The shmid64_ds structure for IA-64 architecture. - * Note extra padding because this structure is passed back and forth - * between kernel and user space. - * - * Pad space is left for: - * - 2 miscellaneous 64-bit values - */ - -struct shmid64_ds { - struct ipc64_perm shm_perm; /* operation perms */ - size_t shm_segsz; /* size of segment (bytes) */ - __kernel_time_t shm_atime; /* last attach time */ - __kernel_time_t shm_dtime; /* last detach time */ - __kernel_time_t shm_ctime; /* last change time */ - __kernel_pid_t shm_cpid; /* pid of creator */ - __kernel_pid_t shm_lpid; /* pid of last operator */ - unsigned long shm_nattch; /* no. of current attaches */ - unsigned long __unused1; - unsigned long __unused2; -}; - -struct shminfo64 { - unsigned long shmmax; - unsigned long shmmin; - unsigned long shmmni; - unsigned long shmseg; - unsigned long shmall; - unsigned long __unused1; - unsigned long __unused2; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif /* _ASM_IA64_SHMBUF_H */ |