summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-11-23 12:50:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-11-23 12:50:17 +0100
commit423282af887b88bad97d1362129c9999593bc608 (patch)
tree7a4b6d4503c1451c1766dbf24f8ee1b0c0481b8a /drivers/acpi/apei
parentACPI, APEI, Fix error return value in apei_map_generic_address() (diff)
parentACPI, APEI: make apei_resources_all static (diff)
downloadlinux-423282af887b88bad97d1362129c9999593bc608.tar.xz
linux-423282af887b88bad97d1362129c9999593bc608.zip
Merge ACPI APEI material for v5.11.
Diffstat (limited to 'drivers/acpi/apei')
-rw-r--r--drivers/acpi/apei/apei-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 3294cc8dc073..c7fdb12c3310 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -287,7 +287,7 @@ struct apei_res {
};
/* Collect all resources requested, to avoid conflict */
-struct apei_resources apei_resources_all = {
+static struct apei_resources apei_resources_all = {
.iomem = LIST_HEAD_INIT(apei_resources_all.iomem),
.ioport = LIST_HEAD_INIT(apei_resources_all.ioport),
};