svn commit: r193845 - head/sys/kern

[Alan Cox]

Author: alc
Date: Tue Jun  9 17:18:41 2009
New Revision: 193845
URL: http://svn.freebsd.org/changeset/base/193845

Log:
  Eliminate an instance of VM_PROT_READ_IS_EXEC that I overlooked in r190705.

Modified:
  head/sys/kern/sysv_shm.c

Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c	Tue Jun  9 17:12:19 2009	(r193844)
+++ head/sys/kern/sysv_shm.c	Tue Jun  9 17:18:41 2009	(r193845)
@@ -391,11 +391,7 @@ kern_shmat(td, shmid, shmaddr, shmflg)
 		goto done2;
 	}
 	size = round_page(shmseg->shm_bsegsz);
-#ifdef VM_PROT_READ_IS_EXEC
-	prot = VM_PROT_READ | VM_PROT_EXECUTE;
-#else
 	prot = VM_PROT_READ;
-#endif
 	if ((shmflg & SHM_RDONLY) == 0)
 		prot |= VM_PROT_WRITE;
 	flags = MAP_ANON | MAP_SHARED;