diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2016-05-18 02:16:10 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-05-18 10:17:25 -0400 |
| commit | ef3f00a4d38e01ec0e7ad1b1c8edc2f5667aaa32 (patch) | |
| tree | 1f2ca2c3f70428cbf8f915355e497df8dd0c3aca /arch | |
| parent | bc231d9ede99518b67a77544d9084f15b898fe2e (diff) | |
perf/x86/intel/uncore: Remove WARN_ON_ONCE in uncore_pci_probe
When booting with nr_cpus=1, uncore_pci_probe tries to init the PCI/uncore
also for the other packages and fails with warning when they are not found.
The warning is bogus because it's correct to fail here for packages which are
not initialized. Remove it and return silently.
Fixes: cf6d445f6897 "perf/x86/uncore: Track packages, not per CPU data"
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: stable@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 16c178916412..fce74062d981 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c | |||
| @@ -891,7 +891,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id | |||
| 891 | return -ENODEV; | 891 | return -ENODEV; |
| 892 | 892 | ||
| 893 | pkg = topology_phys_to_logical_pkg(phys_id); | 893 | pkg = topology_phys_to_logical_pkg(phys_id); |
| 894 | if (WARN_ON_ONCE(pkg < 0)) | 894 | if (pkg < 0) |
| 895 | return -EINVAL; | 895 | return -EINVAL; |
| 896 | 896 | ||
| 897 | if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) { | 897 | if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) { |