Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:41:21 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: compiler.h kernel.h
Log Message:
Move attributes, barrier(), and likely/unlikely to linux/compiler.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/common/include/linux/compiler.h
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/common/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/common/include/linux/compiler.h
diff -u src/sys/external/bsd/common/include/linux/compiler.h:1.3 src/sys/external/bsd/common/include/linux/compiler.h:1.4
--- src/sys/external/bsd/common/include/linux/compiler.h:1.3 Sun Dec 19 01:24:36 2021
+++ src/sys/external/bsd/common/include/linux/compiler.h Sun Dec 19 01:41:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: compiler.h,v 1.3 2021/12/19 01:24:36 riastradh Exp $ */
+/* $NetBSD: compiler.h,v 1.4 2021/12/19 01:41:21 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -33,9 +33,26 @@
#define _LINUX_COMPILER_H_
#include <sys/atomic.h>
+#include <sys/cdefs.h>
#include <asm/barrier.h>
+#define __printf __printflike
+#define __user
+#if __GNUC_PREREQ__(4,0) /* not sure when but this will work */
+#define __must_check __attribute__((warn_unused_result))
+#else
+#define __must_check /* nothing */
+#endif
+#define __always_unused __unused
+#define __maybe_unused __unused
+#define noinline __noinline
+#define __deprecated /* nothing */
+
+#define barrier() __insn_barrier()
+#define likely(X) __predict_true(X)
+#define unlikely(X) __predict_false(X)
+
#define READ_ONCE(X) ({ \
typeof(X) __read_once_tmp = (X); \
membar_datadep_consumer(); \
Index: src/sys/external/bsd/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.37 src/sys/external/bsd/common/include/linux/kernel.h:1.38
--- src/sys/external/bsd/common/include/linux/kernel.h:1.37 Sun Dec 19 01:40:20 2021
+++ src/sys/external/bsd/common/include/linux/kernel.h Sun Dec 19 01:41:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.37 2021/12/19 01:40:20 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.38 2021/12/19 01:41:21 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -65,22 +65,6 @@
#define IS_ENABLED(option) (option)
#define IS_REACHABLE(option) (option)
-#define __printf __printflike
-#define __user
-#if __GNUC_PREREQ__(4,0) /* not sure when but this will work */
-#define __must_check __attribute__((warn_unused_result))
-#else
-#define __must_check /* nothing */
-#endif
-#define __always_unused __unused
-#define __maybe_unused __unused
-#define noinline __noinline
-#define __deprecated /* nothing */
-
-#define barrier() __insn_barrier()
-#define likely(X) __predict_true(X)
-#define unlikely(X) __predict_false(X)
-
#define might_sleep ASSERT_SLEEPABLE
#define DEFINE_STATIC_KEY_FALSE(N) bool N __unused = false
