Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:59:02 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: vmalloc.h
Added Files:
src/sys/external/bsd/drm2/include/linux: overflow.h
Log Message:
Define Linux array_size function and expose via vmalloc.h.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/overflow.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/vmalloc.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/vmalloc.h
diff -u src/sys/external/bsd/drm2/include/linux/vmalloc.h:1.7 src/sys/external/bsd/drm2/include/linux/vmalloc.h:1.8
--- src/sys/external/bsd/drm2/include/linux/vmalloc.h:1.7 Mon Aug 27 14:40:56 2018
+++ src/sys/external/bsd/drm2/include/linux/vmalloc.h Sun Dec 19 00:59:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vmalloc.h,v 1.7 2018/08/27 14:40:56 riastradh Exp $ */
+/* $NetBSD: vmalloc.h,v 1.8 2021/12/19 00:59:01 riastradh Exp $ */
/*-
* Copyright (c) 2013, 2018 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
#include <uvm/uvm_extern.h>
#include <linux/mm_types.h>
+#include <linux/overflow.h>
#include <asm/page.h>
Added files:
Index: src/sys/external/bsd/drm2/include/linux/overflow.h
diff -u /dev/null src/sys/external/bsd/drm2/include/linux/overflow.h:1.1
--- /dev/null Sun Dec 19 00:59:02 2021
+++ src/sys/external/bsd/drm2/include/linux/overflow.h Sun Dec 19 00:59:01 2021
@@ -0,0 +1,48 @@
+/* $NetBSD: overflow.h,v 1.1 2021/12/19 00:59:01 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_OVERFLOW_H_
+#define _LINUX_OVERFLOW_H_
+
+#include <sys/types.h>
+
+static inline size_t
+array_size(size_t nelem, size_t elemsize)
+{
+
+ KASSERT(elemsize != 0);
+ if (nelem >= SIZE_MAX/elemsize)
+ return SIZE_MAX;
+
+ return nelem*elemsize;
+}
+
+#endif /* _LINUX_OVERFLOW_H_ */
