← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to tools/perf/perf.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/perf/perf.c
49
49
        { "version",    cmd_version,    0 },
50
50
        { "script",     cmd_script,     0 },
51
51
        { "sched",      cmd_sched,      0 },
52
 
#ifdef LIBELF_SUPPORT
 
52
#ifdef HAVE_LIBELF_SUPPORT
53
53
        { "probe",      cmd_probe,      0 },
54
54
#endif
55
55
        { "kmem",       cmd_kmem,       0 },
56
56
        { "lock",       cmd_lock,       0 },
57
57
        { "kvm",        cmd_kvm,        0 },
58
58
        { "test",       cmd_test,       0 },
59
 
#ifdef LIBAUDIT_SUPPORT
 
59
#ifdef HAVE_LIBAUDIT_SUPPORT
60
60
        { "trace",      cmd_trace,      0 },
61
61
#endif
62
62
        { "inject",     cmd_inject,     0 },
456
456
{
457
457
        const char *cmd;
458
458
 
 
459
        /* The page_size is placed in util object. */
459
460
        page_size = sysconf(_SC_PAGE_SIZE);
460
461
 
461
462
        cmd = perf_extract_argv0_path(argv[0]);
480
481
                fprintf(stderr, "cannot handle %s internally", cmd);
481
482
                goto out;
482
483
        }
483
 
 
 
484
#ifdef HAVE_LIBAUDIT_SUPPORT
 
485
        if (!prefixcmp(cmd, "trace")) {
 
486
                set_buildid_dir();
 
487
                setup_path();
 
488
                argv[0] = "trace";
 
489
                return cmd_trace(argc, argv, NULL);
 
490
        }
 
491
#endif
484
492
        /* Look for flags.. */
485
493
        argv++;
486
494
        argc--;