Tue Jul 7 03:23:33 2020 UTC ()
Explicitly include <sys/pool.h> here; don't rely on it being included
by the includer.


(thorpej)
diff -r1.4 -r1.5 src/sys/sys/vmem_impl.h
cvs diff -r1.4 -r1.5 src/sys/sys/vmem_impl.h (expand / switch to unified diff)

--- src/sys/sys/vmem_impl.h 2020/04/19 21:11:42 1.4
+++ src/sys/sys/vmem_impl.h 2020/07/07 03:23:33 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vmem_impl.h,v 1.4 2020/04/19 21:11:42 ad Exp $ */ 1/* $NetBSD: vmem_impl.h,v 1.5 2020/07/07 03:23:33 thorpej Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2006 YAMAMOTO Takashi, 4 * Copyright (c)2006 YAMAMOTO Takashi,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -27,26 +27,27 @@ @@ -27,26 +27,27 @@
27 */ 27 */
28 28
29/* 29/*
30 * Data structures private to vmem. 30 * Data structures private to vmem.
31 */ 31 */
32 32
33#ifndef _SYS_VMEM_IMPL_H_ 33#ifndef _SYS_VMEM_IMPL_H_
34#define _SYS_VMEM_IMPL_H_ 34#define _SYS_VMEM_IMPL_H_
35 35
36#include <sys/types.h> 36#include <sys/types.h>
37 37
38#if defined(_KERNEL) 38#if defined(_KERNEL)
39#define QCACHE 39#define QCACHE
 40#include <sys/pool.h>
40#include <sys/vmem.h> 41#include <sys/vmem.h>
41 42
42#define LOCK_DECL(name) \ 43#define LOCK_DECL(name) \
43 kmutex_t name; char lockpad[COHERENCY_UNIT - sizeof(kmutex_t)] 44 kmutex_t name; char lockpad[COHERENCY_UNIT - sizeof(kmutex_t)]
44 45
45#define CONDVAR_DECL(name) \ 46#define CONDVAR_DECL(name) \
46 kcondvar_t name 47 kcondvar_t name
47 48
48#else /* defined(_KERNEL) */ 49#else /* defined(_KERNEL) */
49#include <stdio.h> 50#include <stdio.h>
50#include <errno.h> 51#include <errno.h>
51#include <assert.h> 52#include <assert.h>
52#include <stdlib.h> 53#include <stdlib.h>