diff options
| -rw-r--r-- | usr/src/cmd/mdb/common/libstandctf/mapfile | 1 | ||||
| -rw-r--r-- | usr/src/common/ctf/ctf_open.c | 10 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/mapfile-vers | 1 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_module.c | 11 | ||||
| -rw-r--r-- | usr/src/uts/common/ctf/mapfile | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ctf_api.h | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/dtrace/fbt.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/sparc/dtrace/fbt.c | 5 |
8 files changed, 0 insertions, 35 deletions
diff --git a/usr/src/cmd/mdb/common/libstandctf/mapfile b/usr/src/cmd/mdb/common/libstandctf/mapfile index 2ea8c788c0..e72c2ddbcf 100644 --- a/usr/src/cmd/mdb/common/libstandctf/mapfile +++ b/usr/src/cmd/mdb/common/libstandctf/mapfile @@ -70,7 +70,6 @@ SYMBOL_SCOPE { ctf_member_iter; ctf_open; ctf_parent_name; - ctf_parent_label; ctf_setmodel; ctf_setspecific; ctf_type_align; diff --git a/usr/src/common/ctf/ctf_open.c b/usr/src/common/ctf/ctf_open.c index e494ac3156..e49a4cb329 100644 --- a/usr/src/common/ctf/ctf_open.c +++ b/usr/src/common/ctf/ctf_open.c @@ -889,16 +889,6 @@ ctf_parent_name(ctf_file_t *fp) } /* - * Return the label of the parent CTF container, if one exists. Otherwise - * return NULL. - */ -const char * -ctf_parent_label(ctf_file_t *fp) -{ - return (fp->ctf_parlabel); -} - -/* * Import the types from the specified parent container by storing a pointer * to it in ctf_parent and incrementing its reference count. Only one parent * is allowed: if a parent already exists, it is replaced by the new parent. diff --git a/usr/src/lib/libctf/common/mapfile-vers b/usr/src/lib/libctf/common/mapfile-vers index 031748c497..c218edc37c 100644 --- a/usr/src/lib/libctf/common/mapfile-vers +++ b/usr/src/lib/libctf/common/mapfile-vers @@ -68,7 +68,6 @@ SYMBOL_VERSION SUNWprivate_1.2 { ctf_member_info; ctf_parent_file; ctf_parent_name; - ctf_parent_label; ctf_set_array; ctf_type_align; ctf_type_cmp; diff --git a/usr/src/lib/libdtrace/common/dt_module.c b/usr/src/lib/libdtrace/common/dt_module.c index c74fb527a0..1490f775c3 100644 --- a/usr/src/lib/libdtrace/common/dt_module.c +++ b/usr/src/lib/libdtrace/common/dt_module.c @@ -646,17 +646,6 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp) goto err; } - /* - * If the label we claim the parent must have does not match - * its actual topmost label (XXX: Should check all?), ignore - * the CTF entirely rather than acquiring possibly bad type - * references. - */ - if (strcmp(ctf_label_topmost(pfp), ctf_parent_label(dmp->dm_ctfp)) != 0) { - (void) dt_set_errno(dtp, EDT_NOCTF); - goto err; - } - if (ctf_import(dmp->dm_ctfp, pfp) == CTF_ERR) { dtp->dt_ctferr = ctf_errno(dmp->dm_ctfp); (void) dt_set_errno(dtp, EDT_CTF); diff --git a/usr/src/uts/common/ctf/mapfile b/usr/src/uts/common/ctf/mapfile index 40f300686e..ca83165803 100644 --- a/usr/src/uts/common/ctf/mapfile +++ b/usr/src/uts/common/ctf/mapfile @@ -82,7 +82,6 @@ SYMBOL_SCOPE { ctf_open; ctf_parent_file; ctf_parent_name; - ctf_parent_label; ctf_setmodel; ctf_setspecific; ctf_set_array; diff --git a/usr/src/uts/common/sys/ctf_api.h b/usr/src/uts/common/sys/ctf_api.h index bef3549e80..17b0b7262e 100644 --- a/usr/src/uts/common/sys/ctf_api.h +++ b/usr/src/uts/common/sys/ctf_api.h @@ -154,7 +154,6 @@ extern void ctf_close(ctf_file_t *); extern ctf_file_t *ctf_parent_file(ctf_file_t *); extern const char *ctf_parent_name(ctf_file_t *); -extern const char *ctf_parent_label(ctf_file_t *); extern int ctf_import(ctf_file_t *, ctf_file_t *); extern int ctf_setmodel(ctf_file_t *, int); diff --git a/usr/src/uts/intel/dtrace/fbt.c b/usr/src/uts/intel/dtrace/fbt.c index 513acfd5db..b9353bd30c 100644 --- a/usr/src/uts/intel/dtrace/fbt.c +++ b/usr/src/uts/intel/dtrace/fbt.c @@ -629,11 +629,6 @@ fbt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc) goto err; } - if (strcmp(ctf_label_topmost(pfp), ctf_parent_label(fp)) != 0) { - ctf_close(pfp); - goto err; - } - if (ctf_import(fp, pfp) != 0) { ctf_close(pfp); goto err; diff --git a/usr/src/uts/sparc/dtrace/fbt.c b/usr/src/uts/sparc/dtrace/fbt.c index 2497322684..58169bac81 100644 --- a/usr/src/uts/sparc/dtrace/fbt.c +++ b/usr/src/uts/sparc/dtrace/fbt.c @@ -1657,11 +1657,6 @@ fbt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc) if ((pfp = ctf_modopen(mod->mod_mp, &error)) == NULL) goto err; - if (strcmp(ctf_label_topmost(pfp), ctf_parent_label(fp)) != 0) { - ctf_close(pfp); - goto err; - } - if (ctf_import(fp, pfp) != 0) { ctf_close(pfp); goto err; |