patch-2.3.39 linux/include/linux/shm.h

Next file: linux/include/linux/smb_fs.h
Previous file: linux/include/linux/sem.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.38/linux/include/linux/shm.h linux/include/linux/shm.h
@@ -16,9 +16,10 @@
 
 #include <asm/shmparam.h>
 
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
 struct shmid_ds {
 	struct ipc_perm		shm_perm;	/* operation perms */
-	size_t			shm_segsz;	/* size of segment (bytes) */
+	int			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 */
@@ -30,6 +31,9 @@
 	void			*shm_unused3;	/* unused */
 };
 
+/* Include the definition of shmid64_ds and shminfo64 */
+#include <asm/shmbuf.h>
+
 /* permission flag for shmget */
 #define SHM_R		0400	/* or S_IRUGO from <linux/stat.h> */
 #define SHM_W		0200	/* or S_IWUGO from <linux/stat.h> */
@@ -47,8 +51,9 @@
 #define SHM_STAT 	13
 #define SHM_INFO 	14
 
+/* Obsolete, used only for backwards compatibility */
 struct	shminfo {
-	size_t shmmax;
+	int shmmax;
 	int shmmin;
 	int shmmni;
 	int shmseg;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)