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

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

[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;

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

 include/grub/i386/linux.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index ce30e7fb01b..6da5f030fd1 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -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
-- 
2.28.0

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

[Javier Martinez Canillas]

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

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 include/grub/arm/system.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/grub/arm/system.h b/include/grub/arm/system.h
index f62c18c13a8..f15ce9751a5 100644
--- a/include/grub/arm/system.h
+++ b/include/grub/arm/system.h
@@ -1,6 +1,7 @@
 #ifndef GRUB_SYSTEM_CPU_HEADER
 #define GRUB_SYSTEM_CPU_HEADER
 
+#include <grub/symbol.h>
 #include <grub/types.h>
 
 enum
-- 
2.28.0

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

[Daniel Kiper]

On Thu, Nov 05, 2020 at 03:58:56PM +0100, Javier Martinez Canillas wrote:
> 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;
>
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

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

Daniel