diff --git a/[refs] b/[refs] index 3862a3b54c55..04f168ed94b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f91183fe3780d44849110a1653dfe8af7bc67aa4 +refs/heads/master: db20c0031288ff524d82b1f240f35f85d4a052eb diff --git a/trunk/Documentation/perf_counter/builtin-top.c b/trunk/Documentation/perf_counter/builtin-top.c index cacaa3c2518d..6b1c66f99e4d 100644 --- a/trunk/Documentation/perf_counter/builtin-top.c +++ b/trunk/Documentation/perf_counter/builtin-top.c @@ -727,7 +727,7 @@ static const struct option options[] = { "number of mmap data pages"), OPT_INTEGER('r', "realtime", &realtime_prio, "collect data with this RT SCHED_FIFO priority"), - OPT_INTEGER('d', "delay", &realtime_prio, + OPT_INTEGER('d', "delay", &delay_secs, "number of seconds to delay between refreshes"), OPT_BOOLEAN('D', "dump-symtab", &dump_symtab, "dump the symbol table used for profiling"),