diff options
author | Jeremy Cline <jcline@redhat.com> | 2018-10-23 14:36:56 -0400 |
---|---|---|
committer | Jeremy Cline <jcline@redhat.com> | 2018-10-23 14:36:56 -0400 |
commit | 764628643cfcb53d59edf15adf7f32508a220c0e (patch) | |
tree | 74ca9229375ba1562da2fee8ceb0f658f11f9bb8 /0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch | |
parent | 6fcbd945bc574b93b64a087473420454f2dda0e5 (diff) | |
download | kernel-764628643cfcb53d59edf15adf7f32508a220c0e.tar.gz kernel-764628643cfcb53d59edf15adf7f32508a220c0e.tar.xz kernel-764628643cfcb53d59edf15adf7f32508a220c0e.zip |
Sync up stabilization with f29
Diffstat (limited to '0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch')
-rw-r--r-- | 0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch b/0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch new file mode 100644 index 000000000..ec1ff7fbc --- /dev/null +++ b/0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch @@ -0,0 +1,33 @@ +From 421b8aef3902426c4c3ebd23218c0ad282786e1d Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Tue, 3 Jul 2018 17:43:10 +0200 +Subject: [PATCH 5/7] efi/bgrt: Drop __initdata from bgrt_image_size + +bgrt_image_size is necessary to (optionally) show the boot graphics from +the efifb code. The efifb driver is a platform driver, using a normal +driver probe() driver callback. So even though it is always builtin it +cannot reference __initdata. + +Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> +--- + drivers/firmware/efi/efi-bgrt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/firmware/efi/efi-bgrt.c b/drivers/firmware/efi/efi-bgrt.c +index 50793fda7819..b22ccfb0c991 100644 +--- a/drivers/firmware/efi/efi-bgrt.c ++++ b/drivers/firmware/efi/efi-bgrt.c +@@ -20,7 +20,7 @@ + #include <linux/efi-bgrt.h> + + struct acpi_table_bgrt bgrt_tab; +-size_t __initdata bgrt_image_size; ++size_t bgrt_image_size; + + struct bmp_header { + u16 id; +-- +2.18.0 + |