Deleted Added
full compact
sysv_shm.c (116182) sysv_shm.c (118607)
1/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
2/*
3 * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
1/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
2/*
3 * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/kern/sysv_shm.c 116182 2003-06-11 00:56:59Z obrien $");
33__FBSDID("$FreeBSD: head/sys/kern/sysv_shm.c 118607 2003-08-07 15:04:27Z jhb $");
34
35#include "opt_compat.h"
36#include "opt_sysvipc.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>
41#include <sys/lock.h>

--- 355 unchanged lines hidden (view full) ---

397 struct shmat_args *uap;
398{
399 return kern_shmat(td, uap->shmid, uap->shmaddr, uap->shmflg, 0);
400}
401
402struct oshmid_ds {
403 struct ipc_perm shm_perm; /* operation perms */
404 int shm_segsz; /* size of segment (bytes) */
34
35#include "opt_compat.h"
36#include "opt_sysvipc.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>
41#include <sys/lock.h>

--- 355 unchanged lines hidden (view full) ---

397 struct shmat_args *uap;
398{
399 return kern_shmat(td, uap->shmid, uap->shmaddr, uap->shmflg, 0);
400}
401
402struct oshmid_ds {
403 struct ipc_perm shm_perm; /* operation perms */
404 int shm_segsz; /* size of segment (bytes) */
405 ushort shm_cpid; /* pid, creator */
406 ushort shm_lpid; /* pid, last operation */
405 u_short shm_cpid; /* pid, creator */
406 u_short shm_lpid; /* pid, last operation */
407 short shm_nattch; /* no. of current attaches */
408 time_t shm_atime; /* last attach time */
409 time_t shm_dtime; /* last detach time */
410 time_t shm_ctime; /* last change time */
411 void *shm_handle; /* internal handle for shm segment */
412};
413
414struct oshmctl_args {

--- 535 unchanged lines hidden ---
407 short shm_nattch; /* no. of current attaches */
408 time_t shm_atime; /* last attach time */
409 time_t shm_dtime; /* last detach time */
410 time_t shm_ctime; /* last change time */
411 void *shm_handle; /* internal handle for shm segment */
412};
413
414struct oshmctl_args {

--- 535 unchanged lines hidden ---