svn commit: r286241 - in head/sys/cddl/dev/fbt: . aarch64 arm powerpc x86

[Mark Johnston]

Author: markj
Date: Mon Aug  3 17:39:36 2015
New Revision: 286241
URL: https://svnweb.freebsd.org/changeset/base/286241

Log:
  Remove a couple of unused fields from the FBT probe struct.

Modified:
  head/sys/cddl/dev/fbt/aarch64/fbt_isa.c
  head/sys/cddl/dev/fbt/arm/fbt_isa.c
  head/sys/cddl/dev/fbt/fbt.h
  head/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  head/sys/cddl/dev/fbt/x86/fbt_isa.c

Modified: head/sys/cddl/dev/fbt/aarch64/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/aarch64/fbt_isa.c	Mon Aug  3 17:02:36 2015	(r286240)
+++ head/sys/cddl/dev/fbt/aarch64/fbt_isa.c	Mon Aug  3 17:39:36 2015	(r286241)
@@ -58,7 +58,6 @@ fbt_invop(uintptr_t addr, uintptr_t *sta
 
 	for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
 		if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
-			fbt->fbtp_invop_cnt++;
 			cpu->cpu_dtrace_caller = addr;
 
 			dtrace_probe(fbt->fbtp_id, frame->tf_x[0],

Modified: head/sys/cddl/dev/fbt/arm/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/arm/fbt_isa.c	Mon Aug  3 17:02:36 2015	(r286240)
+++ head/sys/cddl/dev/fbt/arm/fbt_isa.c	Mon Aug  3 17:39:36 2015	(r286241)
@@ -56,7 +56,6 @@ fbt_invop(uintptr_t addr, uintptr_t *sta
 
 	for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
 		if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
-			fbt->fbtp_invop_cnt++;
 			cpu->cpu_dtrace_caller = addr;
 
 			/* TODO: Need 5th parameter from stack */

Modified: head/sys/cddl/dev/fbt/fbt.h
==============================================================================
--- head/sys/cddl/dev/fbt/fbt.h	Mon Aug  3 17:02:36 2015	(r286240)
+++ head/sys/cddl/dev/fbt/fbt.h	Mon Aug  3 17:39:36 2015	(r286241)
@@ -45,8 +45,6 @@ typedef struct fbt_probe {
 	const char	*fbtp_name;
 	modctl_t	*fbtp_ctl;
 	int		fbtp_loadcnt;
-	int		fbtp_primary;
-	int		fbtp_invop_cnt;
 	int		fbtp_symindx;
 	struct fbt_probe *fbtp_next;
 } fbt_probe_t;

Modified: head/sys/cddl/dev/fbt/powerpc/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/powerpc/fbt_isa.c	Mon Aug  3 17:02:36 2015	(r286240)
+++ head/sys/cddl/dev/fbt/powerpc/fbt_isa.c	Mon Aug  3 17:39:36 2015	(r286241)
@@ -60,7 +60,6 @@ fbt_invop(uintptr_t addr, uintptr_t *sta
 
 	for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
 		if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
-			fbt->fbtp_invop_cnt++;
 			if (fbt->fbtp_roffset == 0) {
 				cpu->cpu_dtrace_caller = addr;
 

Modified: head/sys/cddl/dev/fbt/x86/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/x86/fbt_isa.c	Mon Aug  3 17:02:36 2015	(r286240)
+++ head/sys/cddl/dev/fbt/x86/fbt_isa.c	Mon Aug  3 17:39:36 2015	(r286241)
@@ -66,7 +66,6 @@ fbt_invop(uintptr_t addr, uintptr_t *sta
 
 	for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
 		if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
-			fbt->fbtp_invop_cnt++;
 			if (fbt->fbtp_roffset == 0) {
 				int i = 0;
 				/*