summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2023-05-12 12:02:54 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2023-05-12 12:02:54 +1000
commita56a2d101022f18ab31bc6f516d0fb37a2839fe0 (patch)
tree3bab84f81834954290df3ad7710825111f82e46d
parent59a363f510ba349bfdb4d117e093a651d8b0c16d (diff)
parent0153431c85af3d4470ac8c59a3f854a3926dff86 (diff)
downloadlinux-next-a56a2d101022f18ab31bc6f516d0fb37a2839fe0.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,