| Message ID | 20240405081257.9515-1-heinrich.schuchardt@canonical.com |
|---|---|
| State | Accepted, archived |
| Commit | b34ce3113babd3e6e56196431146a15c5bc6c92e |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | [1/1] efi_loader: eliminate duplicate runtime section definitions | expand |
On Fri, 5 Apr 2024 at 11:13, Heinrich Schuchardt <heinrich.schuchardt@canonical.com> wrote: > > The following symbols are defined in two includes: > > * __efi_runtime_start[] > * __efi_runtime_stop[] > * __efi_runtime_rel_start[] > * __efi_runtime_rel_stop[] > > Eliminate the definitions in efi_loader.h. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > include/efi_loader.h | 3 --- > lib/efi_loader/efi_memory.c | 1 + > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/efi_loader.h b/include/efi_loader.h > index 7daca0afba..bb51c02817 100644 > --- a/include/efi_loader.h > +++ b/include/efi_loader.h > @@ -345,9 +345,6 @@ extern const efi_guid_t smbios3_guid; > extern const efi_guid_t efi_guid_text_input_protocol; > extern const efi_guid_t efi_guid_text_output_protocol; > > -extern char __efi_runtime_start[], __efi_runtime_stop[]; > -extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[]; > - > /** > * struct efi_open_protocol_info_item - open protocol info item > * > diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c > index edfad2d95a..81f5f98a8a 100644 > --- a/lib/efi_loader/efi_memory.c > +++ b/lib/efi_loader/efi_memory.c > @@ -15,6 +15,7 @@ > #include <watchdog.h> > #include <asm/cache.h> > #include <asm/global_data.h> > +#include <asm/sections.h> > #include <linux/list_sort.h> > #include <linux/sizes.h> > > -- > 2.43.0 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/include/efi_loader.h b/include/efi_loader.h index 7daca0afba..bb51c02817 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -345,9 +345,6 @@ extern const efi_guid_t smbios3_guid; extern const efi_guid_t efi_guid_text_input_protocol; extern const efi_guid_t efi_guid_text_output_protocol; -extern char __efi_runtime_start[], __efi_runtime_stop[]; -extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[]; - /** * struct efi_open_protocol_info_item - open protocol info item * diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index edfad2d95a..81f5f98a8a 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -15,6 +15,7 @@ #include <watchdog.h> #include <asm/cache.h> #include <asm/global_data.h> +#include <asm/sections.h> #include <linux/list_sort.h> #include <linux/sizes.h>
The following symbols are defined in two includes: * __efi_runtime_start[] * __efi_runtime_stop[] * __efi_runtime_rel_start[] * __efi_runtime_rel_stop[] Eliminate the definitions in efi_loader.h. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- include/efi_loader.h | 3 --- lib/efi_loader/efi_memory.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)