summaryrefslogtreecommitdiff
path: root/arch/x86/events
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-13 16:58:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-13 16:58:05 -0800
commiteb4d47c8ce5bc2dac5f9ffc27dc9594f6bc2cacb (patch)
tree0a46192f06e408d2f4bbe1d5c3ce1903074de1e3 /arch/x86/events
parent6a9f70b0a5b3ca5db1dd5c7743ca555bfca2ae08 (diff)
parent642e641cbea57e559720b9df09889ffcf525cf04 (diff)
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "Two changes: Propagate const/__initconst, and use ARRAY_SIZE() some more" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/events/amd/iommu: Make iommu_pmu const and __initconst x86: Use ARRAY_SIZE
Diffstat (limited to 'arch/x86/events')
-rw-r--r--arch/x86/events/amd/iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 3641e24fdac5..38b5d41b0c37 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -405,7 +405,7 @@ const struct attribute_group *amd_iommu_attr_groups[] = {
NULL,
};
-static struct pmu iommu_pmu = {
+static const struct pmu iommu_pmu __initconst = {
.event_init = perf_iommu_event_init,
.add = perf_iommu_add,
.del = perf_iommu_del,