Deleted Added
full compact
sysv_shm.c (122088) sysv_shm.c (122201)
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 122088 2003-11-05 01:53:10Z fjoe $");
33__FBSDID("$FreeBSD: head/sys/kern/sysv_shm.c 122201 2003-11-07 04:47:14Z rwatson $");
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>

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

390 shmseg->shm_atime = time_second;
391 shmseg->shm_nattch++;
392 td->td_retval[0] = attach_va;
393done2:
394 mtx_unlock(&Giant);
395 return (error);
396}
397
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>

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

390 shmseg->shm_atime = time_second;
391 shmseg->shm_nattch++;
392 td->td_retval[0] = attach_va;
393done2:
394 mtx_unlock(&Giant);
395 return (error);
396}
397
398int
398int
399shmat(td, uap)
400 struct thread *td;
401 struct shmat_args *uap;
402{
403 return kern_shmat(td, uap->shmid, uap->shmaddr, uap->shmflg);
404}
405
406struct oshmid_ds {

--- 547 unchanged lines hidden ---
399shmat(td, uap)
400 struct thread *td;
401 struct shmat_args *uap;
402{
403 return kern_shmat(td, uap->shmid, uap->shmaddr, uap->shmflg);
404}
405
406struct oshmid_ds {

--- 547 unchanged lines hidden ---