summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2023-05-16 11:23:08 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2023-05-16 11:23:08 +1000
commit026c05b190e08d2d55ed6ff835bb40b345434f64 (patch)
tree028af1443c01828607b12a6f86a74888fcdfbe3e
parent4c8a1e0e585c70a3e13589ab34f394e659c7b925 (diff)
parent0153431c85af3d4470ac8c59a3f854a3926dff86 (diff)
downloadlinux-next-026c05b190e08d2d55ed6ff835bb40b345434f64.tar.gz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
-rw-r--r--arch/x86/platform/efi/runtime-map.c2
-rw-r--r--drivers/firmware/efi/esrt.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/runtime-map.c b/arch/x86/platform/efi/runtime-map.c
index bbee682ef8cd..a6f02cef3ca2 100644
--- a/arch/x86/platform/efi/runtime-map.c
+++ b/arch/x86/platform/efi/runtime-map.c
@@ -93,7 +93,7 @@ static void map_release(struct kobject *kobj)
kfree(entry);
}
-static struct kobj_type __refdata map_ktype = {
+static const struct kobj_type __refconst map_ktype = {
.sysfs_ops = &map_attr_ops,
.default_groups = def_groups,
.release = map_release,
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index 87729c365be1..c61398634d75 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -156,7 +156,7 @@ static void esre_release(struct kobject *kobj)
kfree(entry);
}
-static struct kobj_type esre1_ktype = {
+static const struct kobj_type esre1_ktype = {
.release = esre_release,
.sysfs_ops = &esre_attr_ops,
.default_groups = esre1_groups,