Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/linux Work around broken empty expansi...



details:   https://anonhg.NetBSD.org/src/rev/59a3c190095f
branches:  trunk
changeset: 366374:59a3c190095f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:07:29 2018 +0000

description:
Work around broken empty expansion of SDT_PROBE* if !KDTRACE_HOOKS.

diffstat:

 sys/external/bsd/drm2/linux/linux_idr.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r ae2e030ffa6e -r 59a3c190095f sys/external/bsd/drm2/linux/linux_idr.c
--- a/sys/external/bsd/drm2/linux/linux_idr.c   Mon Aug 27 15:07:11 2018 +0000
+++ b/sys/external/bsd/drm2/linux/linux_idr.c   Mon Aug 27 15:07:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_idr.c,v 1.10 2018/08/27 15:06:54 riastradh Exp $ */
+/*     $NetBSD: linux_idr.c,v 1.11 2018/08/27 15:07:29 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.10 2018/08/27 15:06:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_idr.c,v 1.11 2018/08/27 15:07:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -361,10 +361,11 @@
 out:   mutex_spin_exit(&idr->idr_lock);
 
        /* Discard the node on failure.  */
-       if (id < 0)
+       if (id < 0) {
                cache->ic_node = node;
-       else
+       } else {
                SDT_PROBE3(sdt, linux, idr, alloc,  idr, id, data);
+       }
        return id;
 }
 



Home | Main Index | Thread Index | Old Index