[src/netbsd-2-0]: src/sys/sys Pullup rev 1.36-1.37 (requested by jdolecek in ...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/763e235448c1
branches:  netbsd-2-0
changeset: 562743:763e235448c1
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Oct 04 05:19:13 2004 +0000

description:
Pullup rev 1.36-1.37 (requested by jdolecek in ticket #884)

Fix linux handling of SysV-style shared memory. Fixed Linux VMware display
problems.

diffstat:

 sys/sys/shm.h |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 0c11e2097bb6 -r 763e235448c1 sys/sys/shm.h
--- a/sys/sys/shm.h     Mon Oct 04 05:19:09 2004 +0000
+++ b/sys/sys/shm.h     Mon Oct 04 05:19:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shm.h,v 1.35 2003/10/20 22:16:33 kleink Exp $  */
+/*     $NetBSD: shm.h,v 1.35.2.1 2004/10/04 05:19:13 jmc Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -82,6 +82,10 @@
 
 #define        SHM_RDONLY      010000  /* Attach read-only (else read-write) */
 #define        SHM_RND         020000  /* Round attach address to SHMLBA */
+#ifdef _KERNEL
+#define _SHM_RMLINGER  040000  /* Attach even if segment removed */
+#endif
+
 /* Segment low boundry address multiple */
 #if defined(_KERNEL) || defined(_STANDALONE) || defined(_LKM)
 #define        SHMLBA          PAGE_SIZE
@@ -187,7 +191,6 @@
 void   shmfork __P((struct vmspace *, struct vmspace *));
 void   shmexit __P((struct vmspace *));
 int    shmctl1 __P((struct proc *, int, int, struct shmid_ds *));
-int    shmat1 __P((struct proc *, int, const void *, int, vaddr_t *, int));
 #else /* !_KERNEL */
 
 __BEGIN_DECLS