Deleted Added
full compact
sysv_shm.c (111119) sysv_shm.c (113448)
1/* $FreeBSD: head/sys/kern/sysv_shm.c 111119 2003-02-19 05:47:46Z imp $ */
1/* $FreeBSD: head/sys/kern/sysv_shm.c 113448 2003-04-13 19:36:18Z alc $ */
2/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
3
4/*
5 * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

652 */
653 if (shm_use_phys) {
654 shm_handle->shm_object =
655 vm_pager_allocate(OBJT_PHYS, 0, size, VM_PROT_DEFAULT, 0);
656 } else {
657 shm_handle->shm_object =
658 vm_pager_allocate(OBJT_SWAP, 0, size, VM_PROT_DEFAULT, 0);
659 }
2/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
3
4/*
5 * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

652 */
653 if (shm_use_phys) {
654 shm_handle->shm_object =
655 vm_pager_allocate(OBJT_PHYS, 0, size, VM_PROT_DEFAULT, 0);
656 } else {
657 shm_handle->shm_object =
658 vm_pager_allocate(OBJT_SWAP, 0, size, VM_PROT_DEFAULT, 0);
659 }
660 vm_object_lock(shm_handle->shm_object);
660 VM_OBJECT_LOCK(shm_handle->shm_object);
661 vm_object_clear_flag(shm_handle->shm_object, OBJ_ONEMAPPING);
662 vm_object_set_flag(shm_handle->shm_object, OBJ_NOSPLIT);
661 vm_object_clear_flag(shm_handle->shm_object, OBJ_ONEMAPPING);
662 vm_object_set_flag(shm_handle->shm_object, OBJ_NOSPLIT);
663 vm_object_unlock(shm_handle->shm_object);
663 VM_OBJECT_UNLOCK(shm_handle->shm_object);
664
665 shmseg->shm_internal = shm_handle;
666 shmseg->shm_perm.cuid = shmseg->shm_perm.uid = cred->cr_uid;
667 shmseg->shm_perm.cgid = shmseg->shm_perm.gid = cred->cr_gid;
668 shmseg->shm_perm.mode = (shmseg->shm_perm.mode & SHMSEG_WANTED) |
669 (mode & ACCESSPERMS) | SHMSEG_ALLOCATED;
670 shmseg->shm_segsz = uap->size;
671 shmseg->shm_cpid = td->td_proc->p_pid;

--- 223 unchanged lines hidden ---
664
665 shmseg->shm_internal = shm_handle;
666 shmseg->shm_perm.cuid = shmseg->shm_perm.uid = cred->cr_uid;
667 shmseg->shm_perm.cgid = shmseg->shm_perm.gid = cred->cr_gid;
668 shmseg->shm_perm.mode = (shmseg->shm_perm.mode & SHMSEG_WANTED) |
669 (mode & ACCESSPERMS) | SHMSEG_ALLOCATED;
670 shmseg->shm_segsz = uap->size;
671 shmseg->shm_cpid = td->td_proc->p_pid;

--- 223 unchanged lines hidden ---