Wed Jul 24 03:01:24 2013 UTC ()
Add __always_unused and round_up to <linux/kernel.h>.


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

--- src/sys/external/bsd/drm2/include/linux/Attic/kernel.h 2013/07/24 02:56:17 1.1.2.15
+++ src/sys/external/bsd/drm2/include/linux/Attic/kernel.h 2013/07/24 03:01:24 1.1.2.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kernel.h,v 1.1.2.15 2013/07/24 02:56:17 riastradh Exp $ */ 1/* $NetBSD: kernel.h,v 1.1.2.16 2013/07/24 03:01:24 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.
@@ -24,36 +24,40 @@ @@ -24,36 +24,40 @@
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/types.h> 36#include <sys/types.h>
 37#include <sys/param.h>
37 38
38#define __printf __printflike 39#define __printf __printflike
39#define __user 40#define __user
40#define __must_check /* __attribute__((warn_unused_result)), if GCC */ 41#define __must_check /* __attribute__((warn_unused_result)), if GCC */
 42#define __always_unused __unused
41 43
42#define barrier() __insn_barrier() 44#define barrier() __insn_barrier()
43#define unlikely(X) __predict_false(X) 45#define unlikely(X) __predict_false(X)
44 46
45#define uninitialized_var(x) x 47#define uninitialized_var(x) x
46 48
 49#define round_up(X, Y) roundup2(X, Y)
 50
47#define container_of(PTR, TYPE, FIELD) \ 51#define container_of(PTR, TYPE, FIELD) \
48 ((void)sizeof((PTR) - \ 52 ((void)sizeof((PTR) - \
49 &((TYPE *)(((char *)(PTR)) - \ 53 &((TYPE *)(((char *)(PTR)) - \
50 offsetof(TYPE, FIELD)))->FIELD), \ 54 offsetof(TYPE, FIELD)))->FIELD), \
51 ((TYPE *)(((char *)(PTR)) - offsetof(TYPE, FIELD)))) 55 ((TYPE *)(((char *)(PTR)) - offsetof(TYPE, FIELD))))
52 56
53#define ARRAY_SIZE(ARRAY) __arraycount(ARRAY) 57#define ARRAY_SIZE(ARRAY) __arraycount(ARRAY)
54 58
55#define swap(X, Y) do \ 59#define swap(X, Y) do \
56{ \ 60{ \
57 /* XXX Kludge for type-safety. */ \ 61 /* XXX Kludge for type-safety. */ \
58 if (&(X) != &(Y)) { \ 62 if (&(X) != &(Y)) { \
59 CTASSERT(sizeof(X) == sizeof(Y)); \ 63 CTASSERT(sizeof(X) == sizeof(Y)); \