Page MenuHomeFreeBSD

D56570.diff
No OneTemporary

D56570.diff

diff --git a/sys/compat/linuxkpi/common/include/linux/array_size.h b/sys/compat/linuxkpi/common/include/linux/array_size.h
new file mode 100644
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/linux/array_size.h
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2010 Isilon Systems, Inc.
+ * Copyright (c) 2010 iX Systems, Inc.
+ * Copyright (c) 2010 Panasas, Inc.
+ * All rights reserved.
+ */
+
+#ifndef _LINUXKPI_LINUX_ARRAY_SIZE_H_
+#define _LINUXKPI_LINUX_ARRAY_SIZE_H_
+
+#include <linux/compiler.h>
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+#endif /* _LINUXKPI_LINUX_ARRAY_SIZE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -40,6 +40,7 @@
#include <sys/syslog.h>
#include <sys/time.h>
+#include <linux/array_size.h>
#include <linux/bitops.h>
#include <linux/build_bug.h>
#include <linux/compiler.h>
@@ -266,8 +267,6 @@
})
#endif
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
#define u64_to_user_ptr(val) ((void *)(uintptr_t)(val))
#define offsetofend(t, m) \
diff --git a/sys/compat/linuxkpi/common/include/linux/kfifo.h b/sys/compat/linuxkpi/common/include/linux/kfifo.h
--- a/sys/compat/linuxkpi/common/include/linux/kfifo.h
+++ b/sys/compat/linuxkpi/common/include/linux/kfifo.h
@@ -30,6 +30,7 @@
#include <sys/types.h>
+#include <linux/array_size.h>
#include <linux/slab.h>
#include <linux/gfp.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h
--- a/sys/compat/linuxkpi/common/include/linux/string.h
+++ b/sys/compat/linuxkpi/common/include/linux/string.h
@@ -31,6 +31,7 @@
#include <sys/ctype.h>
+#include <linux/array_size.h>
#include <linux/types.h>
#include <linux/gfp.h>
#include <linux/slab.h>

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 6:42 AM (10 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32170359
Default Alt Text
D56570.diff (1 KB)

Event Timeline