| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
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. |
| @@ -29,26 +29,27 @@ | | | @@ -29,26 +29,27 @@ |
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. */ \ |