diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2022-09-08 14:41:04 -0700 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-09-13 15:03:23 +0200 |
| commit | b4e12b2d70fd9eccdb3cef8015dc1788ca38e3fd (patch) | |
| tree | fd8e1ebb7e623ae671c338ea59133285816b6596 | |
| parent | 16817ad7e8b31728b44ff9f17d8d894ed8a450d0 (diff) | |
| download | linux-b4e12b2d70fd9eccdb3cef8015dc1788ca38e3fd.tar.gz linux-b4e12b2d70fd9eccdb3cef8015dc1788ca38e3fd.tar.bz2 linux-b4e12b2d70fd9eccdb3cef8015dc1788ca38e3fd.zip | |
perf: Kill __PERF_SAMPLE_CALLCHAIN_EARLY
There's no in-tree user anymore. Let's get rid of it.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220908214104.3851807-3-namhyung@kernel.org
| -rw-r--r-- | arch/x86/events/amd/ibs.c | 10 | ||||
| -rw-r--r-- | arch/x86/events/intel/core.c | 3 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c index dab094166693..ce5720bfb350 100644 --- a/arch/x86/events/amd/ibs.c +++ b/arch/x86/events/amd/ibs.c @@ -300,16 +300,6 @@ static int perf_ibs_init(struct perf_event *event) hwc->config_base = perf_ibs->msr; hwc->config = config; - /* - * rip recorded by IbsOpRip will not be consistent with rsp and rbp - * recorded as part of interrupt regs. Thus we need to use rip from - * interrupt regs while unwinding call stack. Setting _EARLY flag - * makes sure we unwind call-stack before perf sample rip is set to - * IbsOpRip. - */ - if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN) - event->attr.sample_type |= __PERF_SAMPLE_CALLCHAIN_EARLY; - return 0; } diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 7f4e7e6b45f0..b16c91ac9219 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3868,9 +3868,6 @@ static int intel_pmu_hw_config(struct perf_event *event) } if (x86_pmu.pebs_aliases) x86_pmu.pebs_aliases(event); - - if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN) - event->attr.sample_type |= __PERF_SAMPLE_CALLCHAIN_EARLY; } if (needs_branch_stack(event)) { diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index dca16582885f..e639c74cf5fb 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -164,8 +164,6 @@ enum perf_event_sample_format { PERF_SAMPLE_WEIGHT_STRUCT = 1U << 24, PERF_SAMPLE_MAX = 1U << 25, /* non-ABI */ - - __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ }; #define PERF_SAMPLE_WEIGHT_TYPE (PERF_SAMPLE_WEIGHT | PERF_SAMPLE_WEIGHT_STRUCT) |