Date: Sat, 30 Jul 2016 07:05:33 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303544 - head/sys/cddl/contrib/opensolaris/uts/intel/dtrace Message-ID: <201607300705.u6U75XnJ094921@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sat Jul 30 07:05:32 2016 New Revision: 303544 URL: https://svnweb.freebsd.org/changeset/base/303544 Log: Restore an ifdef that should not have been removed in r303535. X-MFC-With: r303535 Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Sat Jul 30 07:04:46 2016 (r303543) +++ head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Sat Jul 30 07:05:32 2016 (r303544) @@ -1088,6 +1088,7 @@ fasttrap_pid_probe(struct reg *rp) if (tp->ftt_ids != NULL) { fasttrap_id_t *id; +#ifdef __amd64 if (p->p_model == DATAMODEL_LP64) { for (id = tp->ftt_ids; id != NULL; id = id->fti_next) { fasttrap_probe_t *probe = id->fti_probe; @@ -1129,6 +1130,7 @@ fasttrap_pid_probe(struct reg *rp) } } } else { +#endif uintptr_t s0, s1, s2, s3, s4, s5; uint32_t *stack = (uint32_t *)rp->r_rsp; @@ -1183,7 +1185,9 @@ fasttrap_pid_probe(struct reg *rp) t[2], t[3], t[4]); } } +#ifdef __amd64 } +#endif } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607300705.u6U75XnJ094921>