• Thomas Richter's avatar
    perf tools: Fix perf tool build error in util/pfm.c · 6a5558f1
    Thomas Richter authored
    I have downloaded linux-next and build the perf tool using
    
      # make LIBPFM4=1
    
    to have libpfm4 support built into perf. The build fails:
    
     # make LIBPFM4=1
    ....
    INSTALL libbpf_headers
      CC      util/pfm.o
    util/pfm.c: In function ‘print_libpfm_event’:
    util/pfm.c:189:9: error: too many arguments to function ‘print_cb->print_event’
      189 |         print_cb->print_event(print_state,
          |         ^~~~~~~~
    util/pfm.c:220:25: error: too many arguments to function ‘print_cb->print_event’
      220 |                         print_cb->print_event(print_state,
    
    The build error is caused by commit d9dc8874 ("perf pmu-events:
    Remove now unused event and metric variables") which changes the
    function prototype of
    
      struct print_callbacks {
          ...
          void (*print_event)(...);  --> last two parameters removed.
      };
    
    but does not adjust the usage of this function prototype in util/pfm.c.
    In file util/pfm.c function print_event() is still invoked with 13
    parameters instead of 11. The compile fails.
    
    When I adjust the file util/pfm.c as in this patch, the build works file.
    Please check this patch for correctness, I have just fixed the compile
    issue.
    
    Fixes: d9dc8874 ("perf pmu-events: Remove now unused event and metric variables")
    Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
    Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    Tested-by: default avatarIan Rogers <irogers@google.com>
    Cc: Heiko Carstens <hca@linux.ibm.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
    Cc: Sven Schnelle <svens@linux.ibm.com>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Cc: egorenar@linux.ibm.com
    Cc: linux-kernel-next@vger.kernel.org
    Link: https://lore.kernel.org/r/20230207140447.1827741-1-tmricht@linux.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    6a5558f1
pfm.c 5.92 KB