Skip to contentSkip to conversation

loader/i386/linux: Include missing <grub/types.h> header

PATCH In review Javier Martinez Canillas 2 participants 3 messages Nov 5, 2020 – Nov 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 loader/i386/linux: Include missing <grub/types.h> header

This header uses types defined in <grub/types.h> but does not include it, which leads to lead compile errors like the following:

In file included from ../include/grub/cpu/linux.h:19,

                 from kern/efi/sb.c:21:

../include/grub/i386/linux.h:80:3: error: unknown type name ‘grub_uint64_t’
80 | grub_uint64_t addr;

---

 include/grub/i386/linux.h | 2 ++
 1 file changed, 2 insertions(+)
include/grub/i386/linux.h +2 -0
index ce30e7fb01b..6da5f030fd1 100644
@@ -19,6 +19,8 @@
 #ifndef GRUB_I386_LINUX_HEADER
 #define GRUB_I386_LINUX_HEADER	1
 
+#include <grub/types.h>
+
 #define GRUB_LINUX_I386_MAGIC_SIGNATURE	0x53726448      /* "HdrS" */
 #define GRUB_LINUX_DEFAULT_SETUP_SECTS	4
 #define GRUB_LINUX_INITRD_MAX_ADDRESS	0x37FFFFFF
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 arm: Include missing <grub/symbol.h> header

The header uses the EXPORT_FUNC() macro defined in <grub/types.h> but doens't include it, which leads to the following compile error on arm:

../include/grub/cpu/system.h:12:13: error: ‘EXPORT_FUNC’ declared as function returning a function

   12 | extern void EXPORT_FUNC(grub_arm_disable_caches_mmu) (void);
      |             ^~~~~~~~~~~
../include/grub/cpu/system.h:12:1: warning: parameter names (without types) in function declaration
   12 | extern void EXPORT_FUNC(grub_arm_disable_caches_mmu) (void);
      | ^~~~~~

make[3]: *** [Makefile:36581: kern/efi/kernel_exec-sb.o] Error 1

---

 include/grub/arm/system.h | 1 +
 1 file changed, 1 insertion(+)
include/grub/arm/system.h +1 -0
index f62c18c13a8..f15ce9751a5 100644
@@ -1,6 +1,7 @@
 #ifndef GRUB_SYSTEM_CPU_HEADER
 #define GRUB_SYSTEM_CPU_HEADER
 
+#include <grub/symbol.h>
 #include <grub/types.h>
 
 enum
Signature · 1 line
2.28.0
#2 lore raw
In reply to Javier Martinez Canillas
Quoted 10 lines · Javier Martinez Canillas

This header uses types defined in <grub/types.h> but does not include it, which leads to lead compile errors like the following:

In file included from ../include/grub/cpu/linux.h:19,

                 from kern/efi/sb.c:21:

../include/grub/i386/linux.h:80:3: error: unknown type name ‘grub_uint64_t’
80 | grub_uint64_t addr;

Confirming this one and giving same for the second patch in this patch set.

Daniel