From owner-p4-projects@FreeBSD.ORG Sun Apr 23 23:17:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C55616A403; Sun, 23 Apr 2006 23:17:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A41B16A400 for ; Sun, 23 Apr 2006 23:17:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04D9443D5A for ; Sun, 23 Apr 2006 23:17:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3NNHalI051742 for ; Sun, 23 Apr 2006 23:17:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3NNHah3051736 for perforce@freebsd.org; Sun, 23 Apr 2006 23:17:36 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Apr 2006 23:17:36 GMT Message-Id: <200604232317.k3NNHah3051736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Apr 2006 23:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=95964 Change 95964 by jb@jb_freebsd2 on 2006/04/23 23:17:10 Comment out some ASSERTs that only work on Solaris. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_actdesc.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_actdesc.c#2 (text+ko) ==== @@ -8,8 +8,10 @@ { dtrace_actdesc_t *act; +#if defined(sun) ASSERT(!DTRACEACT_ISPRINTFLIKE(kind) || (arg != NULL && arg >= KERNELBASE) || (arg == NULL && kind == DTRACEACT_PRINTA)); +#endif act = kmem_zalloc(sizeof (dtrace_actdesc_t), KM_SLEEP); act->dtad_kind = kind; @@ -45,8 +47,10 @@ if (DTRACEACT_ISPRINTFLIKE(kind)) { char *str = (char *)(uintptr_t)act->dtad_arg; +#if defined(sun) ASSERT((str != NULL && (uintptr_t)str >= KERNELBASE) || (str == NULL && act->dtad_kind == DTRACEACT_PRINTA)); +#endif if (str != NULL) kmem_free(str, strlen(str) + 1);