Deleted Added
full compact
sysv_shm.c (253471) sysv_shm.c (255426)
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

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

55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE.
60 */
61
62#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

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

55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE.
60 */
61
62#include <sys/cdefs.h>
63__FBSDID("$FreeBSD: head/sys/kern/sysv_shm.c 253471 2013-07-19 19:06:15Z jhb $");
63__FBSDID("$FreeBSD: head/sys/kern/sysv_shm.c 255426 2013-09-09 18:11:59Z jhb $");
64
65#include "opt_compat.h"
66#include "opt_sysvipc.h"
67
68#include <sys/param.h>
69#include <sys/systm.h>
70#include <sys/kernel.h>
71#include <sys/limits.h>

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

408 PROC_LOCK(p);
409 attach_va = round_page((vm_offset_t)p->p_vmspace->vm_daddr +
410 lim_max(p, RLIMIT_DATA));
411 PROC_UNLOCK(p);
412 }
413
414 vm_object_reference(shmseg->object);
415 rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->object,
64
65#include "opt_compat.h"
66#include "opt_sysvipc.h"
67
68#include <sys/param.h>
69#include <sys/systm.h>
70#include <sys/kernel.h>
71#include <sys/limits.h>

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

408 PROC_LOCK(p);
409 attach_va = round_page((vm_offset_t)p->p_vmspace->vm_daddr +
410 lim_max(p, RLIMIT_DATA));
411 PROC_UNLOCK(p);
412 }
413
414 vm_object_reference(shmseg->object);
415 rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->object,
416 0, &attach_va, size, (flags & MAP_FIXED) ? VMFS_NO_SPACE :
416 0, &attach_va, size, 0, (flags & MAP_FIXED) ? VMFS_NO_SPACE :
417 VMFS_OPTIMAL_SPACE, prot, prot, MAP_INHERIT_SHARE);
418 if (rv != KERN_SUCCESS) {
419 vm_object_deallocate(shmseg->object);
420 error = ENOMEM;
421 goto done2;
422 }
423
424 shmmap_s->va = attach_va;

--- 983 unchanged lines hidden ---
417 VMFS_OPTIMAL_SPACE, prot, prot, MAP_INHERIT_SHARE);
418 if (rv != KERN_SUCCESS) {
419 vm_object_deallocate(shmseg->object);
420 error = ENOMEM;
421 goto done2;
422 }
423
424 shmmap_s->va = attach_va;

--- 983 unchanged lines hidden ---