Module Name: src
Committed By: riastradh
Date: Fri Feb 14 09:38:51 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_dp_helper.c
Added Files:
src/sys/external/bsd/common/include/asm: div64.h
Removed Files:
src/sys/external/bsd/drm2/include/asm: div64.h
Log Message:
Fix undoing of -Wpointer-arith workaround.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/asm/div64.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/include/asm/div64.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/dist/drm/drm_dp_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.10 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c Fri Feb 14 09:38:51 2020
@@ -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 @@ static int drm_dp_i2c_drain_msg(struct d
}
msg.size -= err;
- msg.buffer = msg.buffer + err;
+ msg.buffer += err;
}
return ret;
Added files:
Index: src/sys/external/bsd/common/include/asm/div64.h
diff -u /dev/null src/sys/external/bsd/common/include/asm/div64.h:1.1
--- /dev/null Fri Feb 14 09:38:52 2020
+++ src/sys/external/bsd/common/include/asm/div64.h Fri Feb 14 09:38:51 2020
@@ -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_ */
