Removed nested include of <sys/proc.h> from <vm/vm_object.h> and fixed
the one place that depended on it. wakeup() is now prototyped in <sys/systm.h> so that it is normally visible. Added nested include of <sys/queue.h> in <vm/vm_object.h>. The queue macros are a more fundamental prerequisite for <vm/vm_object.h> than the wakeup prototype and previously happened to be included by namespace pollution from <sys/proc.h> or elsewhere.
This commit is contained in:
parent
259ca3990b
commit
aad9af2ba3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=18942
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: linux_sysvec.c,v 1.6 1996/06/12 05:06:29 gpalmer Exp $
|
||||
* $Id: linux_sysvec.c,v 1.7 1996/06/18 05:15:53 dyson Exp $
|
||||
*/
|
||||
|
||||
/* XXX we use functions that might not exist. */
|
||||
@ -33,6 +33,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sysproto.h>
|
||||
#include <sys/sysent.h>
|
||||
|
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: linux_sysvec.c,v 1.6 1996/06/12 05:06:29 gpalmer Exp $
|
||||
* $Id: linux_sysvec.c,v 1.7 1996/06/18 05:15:53 dyson Exp $
|
||||
*/
|
||||
|
||||
/* XXX we use functions that might not exist. */
|
||||
@ -33,6 +33,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sysproto.h>
|
||||
#include <sys/sysent.h>
|
||||
|
@ -61,7 +61,7 @@
|
||||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_object.h,v 1.30 1996/09/08 20:44:43 dyson Exp $
|
||||
* $Id: vm_object.h,v 1.31 1996/09/28 03:33:31 dyson Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -71,9 +71,7 @@
|
||||
#ifndef _VM_OBJECT_
|
||||
#define _VM_OBJECT_
|
||||
|
||||
#ifdef KERNEL
|
||||
#include <sys/proc.h> /* XXX for wakeup() */
|
||||
#endif
|
||||
#include <sys/queue.h>
|
||||
|
||||
enum obj_type { OBJT_DEFAULT, OBJT_SWAP, OBJT_VNODE, OBJT_DEVICE };
|
||||
typedef enum obj_type objtype_t;
|
||||
|
Loading…
Reference in New Issue
Block a user