aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c39
1 files changed, 2 insertions, 37 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f199fb2e1d2c..97b30f818642 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1355,9 +1355,8 @@ static int __init ftrace_dyn_table_alloc(unsigned long num_to_init)
1355enum { 1355enum {
1356 FTRACE_ITER_FILTER = (1 << 0), 1356 FTRACE_ITER_FILTER = (1 << 0),
1357 FTRACE_ITER_NOTRACE = (1 << 1), 1357 FTRACE_ITER_NOTRACE = (1 << 1),
1358 FTRACE_ITER_FAILURES = (1 << 2), 1358 FTRACE_ITER_PRINTALL = (1 << 2),
1359 FTRACE_ITER_PRINTALL = (1 << 3), 1359 FTRACE_ITER_HASH = (1 << 3),
1360 FTRACE_ITER_HASH = (1 << 4),
1361}; 1360};
1362 1361
1363#define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */ 1362#define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */
@@ -1487,12 +1486,6 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
1487 rec = &iter->pg->records[iter->idx++]; 1486 rec = &iter->pg->records[iter->idx++];
1488 if ((rec->flags & FTRACE_FL_FREE) || 1487 if ((rec->flags & FTRACE_FL_FREE) ||
1489 1488
1490 (!(iter->flags & FTRACE_ITER_FAILURES) &&
1491 (rec->flags & FTRACE_FL_FAILED)) ||
1492
1493 ((iter->flags & FTRACE_ITER_FAILURES) &&
1494 !(rec->flags & FTRACE_FL_FAILED)) ||
1495
1496 ((iter->flags & FTRACE_ITER_FILTER) && 1489 ((iter->flags & FTRACE_ITER_FILTER) &&
1497 !(rec->flags & FTRACE_FL_FILTER)) || 1490 !(rec->flags & FTRACE_FL_FILTER)) ||
1498 1491
@@ -1633,24 +1626,6 @@ ftrace_avail_open(struct inode *inode, struct file *file)
1633 return ret; 1626 return ret;
1634} 1627}
1635 1628
1636static int
1637ftrace_failures_open(struct inode *inode, struct file *file)
1638{
1639 int ret;
1640 struct seq_file *m;
1641 struct ftrace_iterator *iter;
1642
1643 ret = ftrace_avail_open(inode, file);
1644 if (!ret) {
1645 m = file->private_data;
1646 iter = m->private;
1647 iter->flags = FTRACE_ITER_FAILURES;
1648 }
1649
1650 return ret;
1651}
1652
1653
1654static void ftrace_filter_reset(int enable) 1629static void ftrace_filter_reset(int enable)
1655{ 1630{
1656 struct ftrace_page *pg; 1631 struct ftrace_page *pg;
@@ -2448,13 +2423,6 @@ static const struct file_operations ftrace_avail_fops = {
2448 .release = seq_release_private, 2423 .release = seq_release_private,
2449}; 2424};
2450 2425
2451static const struct file_operations ftrace_failures_fops = {
2452 .open = ftrace_failures_open,
2453 .read = seq_read,
2454 .llseek = seq_lseek,
2455 .release = seq_release_private,
2456};
2457
2458static const struct file_operations ftrace_filter_fops = { 2426static const struct file_operations ftrace_filter_fops = {
2459 .open = ftrace_filter_open, 2427 .open = ftrace_filter_open,
2460 .read = seq_read, 2428 .read = seq_read,
@@ -2683,9 +2651,6 @@ static __init int ftrace_init_dyn_debugfs(struct dentry *d_tracer)
2683 trace_create_file("available_filter_functions", 0444, 2651 trace_create_file("available_filter_functions", 0444,
2684 d_tracer, NULL, &ftrace_avail_fops); 2652 d_tracer, NULL, &ftrace_avail_fops);
2685 2653
2686 trace_create_file("failures", 0444,
2687 d_tracer, NULL, &ftrace_failures_fops);
2688
2689 trace_create_file("set_ftrace_filter", 0644, d_tracer, 2654 trace_create_file("set_ftrace_filter", 0644, d_tracer,
2690 NULL, &ftrace_filter_fops); 2655 NULL, &ftrace_filter_fops);
2691 2656