diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:58:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:58:45 +0200 |
| commit | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (patch) | |
| tree | e3431b09e63172968e5e4463bfffac4bf0f8fa1d /arch/x86/events/intel/uncore.h | |
| parent | 6a9f4efe78af6069a11946c64d3d4c86cb42046b (diff) | |
| parent | eb876fbc248e6eb4773a5bc80d205ff7262b1bb5 (diff) | |
| download | linux-3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d.tar.gz linux-3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d.tar.bz2 linux-3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d.zip | |
Merge branch 'x86/topology' into perf/core, to prepare for new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/uncore.h')
| -rw-r--r-- | arch/x86/events/intel/uncore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h index 79eb2e21e4f0..33aba2504cb1 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -108,7 +108,7 @@ struct intel_uncore_extra_reg { struct intel_uncore_box { int pci_phys_id; - int pkgid; /* Logical package ID */ + int dieid; /* Logical die ID */ int n_active; /* number of active events */ int n_events; int cpu; /* cpu to collect events */ @@ -467,7 +467,7 @@ static inline void uncore_box_exit(struct intel_uncore_box *box) static inline bool uncore_box_is_fake(struct intel_uncore_box *box) { - return (box->pkgid < 0); + return (box->dieid < 0); } static inline struct intel_uncore_pmu *uncore_event_to_pmu(struct perf_event *event) |