Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:01:24 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: kernel.h
Log Message:
Add __always_unused and round_up to <linux/kernel.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 \
src/sys/external/bsd/drm2/include/linux/kernel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/kernel.h
diff -u src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.15 src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.16
--- src/sys/external/bsd/drm2/include/linux/kernel.h:1.1.2.15 Wed Jul 24 02:56:17 2013
+++ src/sys/external/bsd/drm2/include/linux/kernel.h Wed Jul 24 03:01:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.1.2.15 2013/07/24 02:56:17 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.1.2.16 2013/07/24 03:01:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,16 +34,20 @@
#include <sys/cdefs.h>
#include <sys/types.h>
+#include <sys/param.h>
#define __printf __printflike
#define __user
#define __must_check /* __attribute__((warn_unused_result)), if GCC */
+#define __always_unused __unused
#define barrier() __insn_barrier()
#define unlikely(X) __predict_false(X)
#define uninitialized_var(x) x
+#define round_up(X, Y) roundup2(X, Y)
+
#define container_of(PTR, TYPE, FIELD) \
((void)sizeof((PTR) - \
&((TYPE *)(((char *)(PTR)) - \
