diff options
| author | Like Xu <like.xu@linux.intel.com> | 2021-01-25 13:14:58 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-01-27 17:26:58 +0100 |
| commit | abd562df94d19d0a9769971a35801b3f4991715d (patch) | |
| tree | f1655aa09ed1617d1b6d25f7da44662d6be51f8e /arch/x86/include/asm/perf_event.h | |
| parent | perf/x86/intel/uncore: With > 8 nodes, get pci bus die id from NUMA info (diff) | |
| download | linux-abd562df94d19d0a9769971a35801b3f4991715d.tar.xz linux-abd562df94d19d0a9769971a35801b3f4991715d.zip | |
x86/perf: Use static_call for x86_pmu.guest_get_msrs
Clean up that CONFIG_RETPOLINE crud and replace the
indirect call x86_pmu.guest_get_msrs with static_call().
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Like Xu <like.xu@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210125121458.181635-1-like.xu@linux.intel.com
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index b9a7fd0a27e2..e2a4c785e4e3 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -483,11 +483,7 @@ static inline void perf_check_microcode(void) { } extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); extern int x86_perf_get_lbr(struct x86_pmu_lbr *lbr); #else -static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr) -{ - *nr = 0; - return NULL; -} +struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); static inline int x86_perf_get_lbr(struct x86_pmu_lbr *lbr) { return -1; |