[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmo...

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

details:   https://anonhg.NetBSD.org/src/rev/29ba242fc39e
branches:  netbsd-7
changeset: 799796:29ba242fc39e
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Feb 11 23:25:51 2016 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1110):
        sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c: revision 1.3
Don't ask `size < 0' when size is unsigned.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 574aedbb3a93 -r 29ba242fc39e sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c  Thu Feb 11 23:23:11 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c  Thu Feb 11 23:25:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_perfmon_base.c,v 1.1.1.1.4.1 2014/09/21 17:41:53 snj Exp $      */
+/*     $NetBSD: nouveau_engine_perfmon_base.c,v 1.1.1.1.4.2 2016/02/11 23:25:51 snj Exp $      */
 
 /*
  * Copyright 2013 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_perfmon_base.c,v 1.1.1.1.4.1 2014/09/21 17:41:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_perfmon_base.c,v 1.1.1.1.4.2 2016/02/11 23:25:51 snj Exp $");
 
 #include <core/option.h>
 #include <core/class.h>
@@ -171,8 +171,12 @@
        struct nouveau_perfdom *dom;
        struct nv_perfctr_sample *args = data;
 
+#if 1
+       CTASSERT(sizeof(*args) == 0);
+#else
        if (size < sizeof(*args))
                return -EINVAL;
+#endif
        ppm->sequence++;
 
        list_for_each_entry(dom, &ppm->domains, head) {