File 0023-Fix-type-specifier-error.patch of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File 0023-Fix-type-specifier-error.patch of Package grub2

From 44a51534380297421dcb6e70fd5d4cf6ac91d16f Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Fri, 14 Apr 2023 16:57:29 +0800
Subject: [PATCH 23/28] Fix type specifier error

---
 grub-core/kern/efi/mm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
index 0c86f6986..d36802899 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -625,7 +625,7 @@ grub_nx_init (void)
   if (err)
     {
       grub_dprintf ("nx",
-		    "grub_get_mem_attrs(0x%"PRIxGRUB_UINT64_T", ...) -> 0x%x\n",
+		    "grub_get_mem_attrs(0x%"PRIxGRUB_ADDR", ...) -> 0x%x\n",
 		    stack_current, err);
       grub_error_pop ();
     }
@@ -641,7 +641,7 @@ grub_nx_init (void)
   if (err)
     {
       grub_dprintf ("nx",
-		    "grub_get_mem_attrs(0x%"PRIxGRUB_UINT64_T", ...) -> 0x%x\n",
+		    "grub_get_mem_attrs(0x%"PRIxGRUB_ADDR", ...) -> 0x%x\n",
 		    stack_current, err);
       grub_error_pop ();
     }
@@ -662,7 +662,7 @@ grub_nx_init (void)
       if (err)
 	{
 	  grub_dprintf ("nx",
-			"grub_get_mem_attrs(0x%"PRIxGRUB_UINT64_T", ...) -> 0x%x\n",
+			"grub_get_mem_attrs(0x%"PRIxGRUB_ADDR", ...) -> 0x%x\n",
 			stack_current, err);
 	  grub_error_pop ();
 	  break;
@@ -866,7 +866,7 @@ grub_get_mem_attrs (grub_addr_t addr, grub_size_t size, grub_uint64_t *attrs)
 
   if (physaddr & 0xfff || size & 0xfff || size == 0 || attrs == NULL)
     {
-      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" and attrs %p\n",
+      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_UINT64_T"-0x%"PRIxGRUB_UINT64_T" and attrs %p\n",
 		    __func__, physaddr, physaddr+size-1, attrs);
       return 0;
     }
@@ -900,7 +900,7 @@ grub_update_mem_attrs (grub_addr_t addr, grub_size_t size,
 
   if (physaddr & 0xfff || size & 0xfff || size == 0)
     {
-      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" +%s%s%s -%s%s%s\n",
+      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_UINT64_T"-0x%"PRIxGRUB_UINT64_T" +%s%s%s -%s%s%s\n",
 		    __func__, physaddr, physaddr + size - 1,
 		    (set_attrs & GRUB_MEM_ATTR_R) ? "r" : "",
 		    (set_attrs & GRUB_MEM_ATTR_W) ? "w" : "",
@@ -912,9 +912,9 @@ grub_update_mem_attrs (grub_addr_t addr, grub_size_t size,
     }
 
   uefi_set_attrs = grub_mem_attrs_to_uefi_mem_attrs (set_attrs);
-  grub_dprintf ("nx", "translating set_attrs from 0x%lx to 0x%lx\n", set_attrs, uefi_set_attrs);
+  grub_dprintf ("nx", "translating set_attrs from 0x%" PRIxGRUB_UINT64_T " to 0x%" PRIxGRUB_UINT64_T "\n", set_attrs, uefi_set_attrs);
   uefi_clear_attrs = grub_mem_attrs_to_uefi_mem_attrs (clear_attrs);
-  grub_dprintf ("nx", "translating clear_attrs from 0x%lx to 0x%lx\n", clear_attrs, uefi_clear_attrs);
+  grub_dprintf ("nx", "translating clear_attrs from 0x%" PRIxGRUB_UINT64_T " to 0x%" PRIxGRUB_UINT64_T "\n", clear_attrs, uefi_clear_attrs);
   if (uefi_set_attrs)
     efi_status = efi_call_4(proto->set_memory_attributes,
 			    proto, physaddr, size, uefi_set_attrs);
-- 
2.42.0

Places

File 0023-Fix-type-specifier-error.patch of Package grub2

Places