Wed Jul 24 03:31:29 2013 UTC ()
<linux/delay.h> needs <sys/kernel.h> for hz (in mstohz).


(riastradh)
diff -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/include/linux/delay.h

cvs diff -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/include/linux/delay.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/delay.h 2013/07/24 03:03:06 1.1.2.2
+++ src/sys/external/bsd/drm2/include/linux/delay.h 2013/07/24 03:31:29 1.1.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: delay.h,v 1.1.2.2 2013/07/24 03:03:06 riastradh Exp $ */ 1/* $NetBSD: delay.h,v 1.1.2.3 2013/07/24 03:31:29 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -23,26 +23,27 @@ @@ -23,26 +23,27 @@
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_DELAY_H_ 32#ifndef _LINUX_DELAY_H_
33#define _LINUX_DELAY_H_ 33#define _LINUX_DELAY_H_
34 34
35#include <sys/param.h> 35#include <sys/param.h>
 36#include <sys/kernel.h>
36#include <sys/proc.h> 37#include <sys/proc.h>
37 38
38#include <machine/param.h> 39#include <machine/param.h>
39 40
40#define udelay DELAY 41#define udelay DELAY
41 42
42static inline void 43static inline void
43msleep(unsigned int msec) 44msleep(unsigned int msec)
44{ 45{
45 (void)kpause("lnxmslep", false, mstohz(msec), NULL); 46 (void)kpause("lnxmslep", false, mstohz(msec), NULL);
46} 47}
47 48
48#endif /* _LINUX_DELAY_H_ */ 49#endif /* _LINUX_DELAY_H_ */