Wed Jul 24 02:50:22 2013 UTC ()
Define barrier() as __insn_barrier() in <linux/kernel.h>.


(riastradh)
diff -r1.1.2.12 -r1.1.2.13 src/sys/external/bsd/drm2/include/linux/kernel.h
cvs diff -r1.1.2.12 -r1.1.2.13 src/sys/external/bsd/drm2/include/linux/Attic/kernel.h (switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/Attic/kernel.h 2013/07/24 02:50:07 1.1.2.12
+++ src/sys/external/bsd/drm2/include/linux/Attic/kernel.h 2013/07/24 02:50:22 1.1.2.13
@@ -1,71 +1,72 @@ @@ -1,71 +1,72 @@
1/* $NetBSD: kernel.h,v 1.1.2.12 2013/07/24 02:50:07 riastradh Exp $ */ 1/* $NetBSD: kernel.h,v 1.1.2.13 2013/07/24 02:50:22 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.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
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_KERNEL_H_ 32#ifndef _LINUX_KERNEL_H_
33#define _LINUX_KERNEL_H_ 33#define _LINUX_KERNEL_H_
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37 37
38#define __printf __printflike 38#define __printf __printflike
39#define __user 39#define __user
40#define __must_check /* __attribute__((warn_unused_result)), if GCC */ 40#define __must_check /* __attribute__((warn_unused_result)), if GCC */
41 41
 42#define barrier() __insn_barrier()
42#define unlikely(X) __predict_false(X) 43#define unlikely(X) __predict_false(X)
43 44
44#define container_of(PTR, TYPE, FIELD) \ 45#define container_of(PTR, TYPE, FIELD) \
45 ((void)sizeof((PTR) - \ 46 ((void)sizeof((PTR) - \
46 &((TYPE *)(((char *)(PTR)) - \ 47 &((TYPE *)(((char *)(PTR)) - \
47 offsetof(TYPE, FIELD)))->FIELD), \ 48 offsetof(TYPE, FIELD)))->FIELD), \
48 ((TYPE *)(((char *)(PTR)) - offsetof(TYPE, FIELD)))) 49 ((TYPE *)(((char *)(PTR)) - offsetof(TYPE, FIELD))))
49 50
50#define ARRAY_SIZE(ARRAY) __arraycount(ARRAY) 51#define ARRAY_SIZE(ARRAY) __arraycount(ARRAY)
51 52
52#define swap(X, Y) do \ 53#define swap(X, Y) do \
53{ \ 54{ \
54 /* XXX Kludge for type-safety. */ \ 55 /* XXX Kludge for type-safety. */ \
55 if (&(X) != &(Y)) { \ 56 if (&(X) != &(Y)) { \
56 CTASSERT(sizeof(X) == sizeof(Y)); \ 57 CTASSERT(sizeof(X) == sizeof(Y)); \
57 /* XXX Can't do this much better without typeof. */ \ 58 /* XXX Can't do this much better without typeof. */ \
58 char __swap_tmp[sizeof(X)]; \ 59 char __swap_tmp[sizeof(X)]; \
59 (void)memcpy(__swap_tmp, &(X), sizeof(X)); \ 60 (void)memcpy(__swap_tmp, &(X), sizeof(X)); \
60 (void)memcpy(&(X), &(Y), sizeof(X)); \ 61 (void)memcpy(&(X), &(Y), sizeof(X)); \
61 (void)memcpy(&(Y), __swap_tmp, sizeof(X)); \ 62 (void)memcpy(&(Y), __swap_tmp, sizeof(X)); \
62 } \ 63 } \
63} while (0) 64} while (0)
64 65
65static inline int64_t 66static inline int64_t
66abs64(int64_t x) 67abs64(int64_t x)
67{ 68{
68 return (x < 0? (-x) : x); 69 return (x < 0? (-x) : x);
69} 70}
70 71
71#endif /* _LINUX_KERNEL_H_ */ 72#endif /* _LINUX_KERNEL_H_ */