Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Convert ipc/shm bits to their asm-generic versions.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+4 -127
+1 -29
arch/sh/include/asm/ipcbuf.h
··· 1 - #ifndef __ASM_SH_IPCBUF_H__ 2 - #define __ASM_SH_IPCBUF_H__ 3 - 4 - /* 5 - * The ipc64_perm structure for i386 architecture. 6 - * Note extra padding because this structure is passed back and forth 7 - * between kernel and user space. 8 - * 9 - * Pad space is left for: 10 - * - 32-bit mode_t and seq 11 - * - 2 miscellaneous 32-bit values 12 - */ 13 - 14 - struct ipc64_perm 15 - { 16 - __kernel_key_t key; 17 - __kernel_uid32_t uid; 18 - __kernel_gid32_t gid; 19 - __kernel_uid32_t cuid; 20 - __kernel_gid32_t cgid; 21 - __kernel_mode_t mode; 22 - unsigned short __pad1; 23 - unsigned short seq; 24 - unsigned short __pad2; 25 - unsigned long __unused1; 26 - unsigned long __unused2; 27 - }; 28 - 29 - #endif /* __ASM_SH_IPCBUF_H__ */ 1 + #include <asm-generic/ipcbuf.h>
+1 -31
arch/sh/include/asm/msgbuf.h
··· 1 - #ifndef __ASM_SH_MSGBUF_H 2 - #define __ASM_SH_MSGBUF_H 3 - 4 - /* 5 - * The msqid64_ds structure for i386 architecture. 6 - * Note extra padding because this structure is passed back and forth 7 - * between kernel and user space. 8 - * 9 - * Pad space is left for: 10 - * - 64-bit time_t to solve y2038 problem 11 - * - 2 miscellaneous 32-bit values 12 - */ 13 - 14 - struct msqid64_ds { 15 - struct ipc64_perm msg_perm; 16 - __kernel_time_t msg_stime; /* last msgsnd time */ 17 - unsigned long __unused1; 18 - __kernel_time_t msg_rtime; /* last msgrcv time */ 19 - unsigned long __unused2; 20 - __kernel_time_t msg_ctime; /* last change time */ 21 - unsigned long __unused3; 22 - unsigned long msg_cbytes; /* current number of bytes on queue */ 23 - unsigned long msg_qnum; /* number of messages in queue */ 24 - unsigned long msg_qbytes; /* max number of bytes on queue */ 25 - __kernel_pid_t msg_lspid; /* pid of last msgsnd */ 26 - __kernel_pid_t msg_lrpid; /* last receive pid */ 27 - unsigned long __unused4; 28 - unsigned long __unused5; 29 - }; 30 - 31 - #endif /* __ASM_SH_MSGBUF_H */ 1 + #include <asm-generic/msgbuf.h>
+1 -25
arch/sh/include/asm/sembuf.h
··· 1 - #ifndef __ASM_SH_SEMBUF_H 2 - #define __ASM_SH_SEMBUF_H 3 - 4 - /* 5 - * The semid64_ds structure for i386 architecture. 6 - * Note extra padding because this structure is passed back and forth 7 - * between kernel and user space. 8 - * 9 - * Pad space is left for: 10 - * - 64-bit time_t to solve y2038 problem 11 - * - 2 miscellaneous 32-bit values 12 - */ 13 - 14 - struct semid64_ds { 15 - struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ 16 - __kernel_time_t sem_otime; /* last semop time */ 17 - unsigned long __unused1; 18 - __kernel_time_t sem_ctime; /* last change time */ 19 - unsigned long __unused2; 20 - unsigned long sem_nsems; /* no. of semaphores in array */ 21 - unsigned long __unused3; 22 - unsigned long __unused4; 23 - }; 24 - 25 - #endif /* __ASM_SH_SEMBUF_H */ 1 + #include <asm-generic/sembuf.h>
+1 -42
arch/sh/include/asm/shmbuf.h
··· 1 - #ifndef __ASM_SH_SHMBUF_H 2 - #define __ASM_SH_SHMBUF_H 3 - 4 - /* 5 - * The shmid64_ds structure for i386 architecture. 6 - * Note extra padding because this structure is passed back and forth 7 - * between kernel and user space. 8 - * 9 - * Pad space is left for: 10 - * - 64-bit time_t to solve y2038 problem 11 - * - 2 miscellaneous 32-bit values 12 - */ 13 - 14 - struct shmid64_ds { 15 - struct ipc64_perm shm_perm; /* operation perms */ 16 - size_t shm_segsz; /* size of segment (bytes) */ 17 - __kernel_time_t shm_atime; /* last attach time */ 18 - unsigned long __unused1; 19 - __kernel_time_t shm_dtime; /* last detach time */ 20 - unsigned long __unused2; 21 - __kernel_time_t shm_ctime; /* last change time */ 22 - unsigned long __unused3; 23 - __kernel_pid_t shm_cpid; /* pid of creator */ 24 - __kernel_pid_t shm_lpid; /* pid of last operator */ 25 - unsigned long shm_nattch; /* no. of current attaches */ 26 - unsigned long __unused4; 27 - unsigned long __unused5; 28 - }; 29 - 30 - struct shminfo64 { 31 - unsigned long shmmax; 32 - unsigned long shmmin; 33 - unsigned long shmmni; 34 - unsigned long shmseg; 35 - unsigned long shmall; 36 - unsigned long __unused1; 37 - unsigned long __unused2; 38 - unsigned long __unused3; 39 - unsigned long __unused4; 40 - }; 41 - 42 - #endif /* __ASM_SH_SHMBUF_H */ 1 + #include <asm-generic/shmbuf.h>