[src/trunk]: src/sys/external/bsd Fix undoing of -Wpointer-arith workaround.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/13ddbc613553
branches:  trunk
changeset: 744851:13ddbc613553
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Feb 14 09:38:51 2020 +0000

description:
Fix undoing of -Wpointer-arith workaround.

diffstat:

 sys/external/bsd/common/include/asm/div64.h    |  49 ++++++++++++++++++++++++++
 sys/external/bsd/drm2/dist/drm/drm_dp_helper.c |   6 +-
 sys/external/bsd/drm2/include/asm/div64.h      |  49 --------------------------
 3 files changed, 52 insertions(+), 52 deletions(-)

diffs (133 lines):

diff -r cc8354d429fa -r 13ddbc613553 sys/external/bsd/common/include/asm/div64.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/asm/div64.h       Fri Feb 14 09:38:51 2020 +0000
@@ -0,0 +1,49 @@
+/*     $NetBSD: div64.h,v 1.1 2020/02/14 09:38:51 riastradh Exp $      */
+
+/*-
+ * Copyright (c) 2014 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 _ASM_DIV64_H_
+#define _ASM_DIV64_H_
+
+#include <sys/types.h>
+
+#define        do_div(n_q, d)  _do_div(&(n_q), (d))
+
+static inline uint32_t
+_do_div(uint64_t *n_q, uint32_t d)
+{
+       const uint32_t r = *n_q % d;
+       const uint32_t q = *n_q / d;
+
+       *n_q = q;
+       return r;
+}
+
+#endif  /* _ASM_DIV64_H_ */
diff -r cc8354d429fa -r 13ddbc613553 sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
--- a/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c    Fri Feb 14 09:35:52 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c    Fri Feb 14 09:38:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_dp_helper.c,v 1.10 2020/02/14 04:35:19 riastradh Exp $     */
+/*     $NetBSD: drm_dp_helper.c,v 1.11 2020/02/14 09:38:51 riastradh Exp $     */
 
 /*
  * Copyright © 2009 Keith Packard
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.10 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.11 2020/02/14 09:38:51 riastradh Exp $");
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -668,7 +668,7 @@
                }
 
                msg.size -= err;
-               msg.buffer = msg.buffer + err;
+               msg.buffer += err;
        }
 
        return ret;
diff -r cc8354d429fa -r 13ddbc613553 sys/external/bsd/drm2/include/asm/div64.h
--- a/sys/external/bsd/drm2/include/asm/div64.h Fri Feb 14 09:35:52 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*     $NetBSD: div64.h,v 1.1 2014/07/16 20:56:25 riastradh Exp $      */
-
-/*-
- * Copyright (c) 2014 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 _ASM_DIV64_H_
-#define _ASM_DIV64_H_
-
-#include <sys/types.h>
-
-#define        do_div(n_q, d)  _do_div(&(n_q), (d))
-
-static inline uint32_t
-_do_div(uint64_t *n_q, uint32_t d)
-{
-       const uint32_t r = *n_q % d;
-       const uint32_t q = *n_q / d;
-
-       *n_q = q;
-       return r;
-}
-
-#endif  /* _ASM_DIV64_H_ */