42 lines
1.0 KiB
Diff
42 lines
1.0 KiB
Diff
|
From d3b7dc54cdac474a57b67cf9bcdb15bcb131d06c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Thu, 23 Jul 2020 16:18:52 -0400
|
||
|
|
Subject: [PATCH 52/62] Fix some volatile usage gcc whines about.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
|
|
Upstream: pr#212
|
||
|
|
---
|
||
|
|
fallback.c | 2 +-
|
||
|
|
shim.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fallback.c b/fallback.c
|
||
|
|
index c3f5583c626..5a4bfff0793 100644
|
||
|
|
--- a/fallback.c
|
||
|
|
+++ b/fallback.c
|
||
|
|
@@ -983,7 +983,7 @@ debug_hook(void)
|
||
|
|
UINT8 *data = NULL;
|
||
|
|
UINTN dataSize = 0;
|
||
|
|
EFI_STATUS efi_status;
|
||
|
|
- volatile register int x = 0;
|
||
|
|
+ register volatile int x = 0;
|
||
|
|
extern char _etext, _edata;
|
||
|
|
|
||
|
|
efi_status = get_variable(L"SHIM_DEBUG", &data, &dataSize,
|
||
|
|
diff --git a/shim.c b/shim.c
|
||
|
|
index b35b0ad90cc..0e7e784b4c8 100644
|
||
|
|
--- a/shim.c
|
||
|
|
+++ b/shim.c
|
||
|
|
@@ -2559,7 +2559,7 @@ debug_hook(void)
|
||
|
|
UINT8 *data = NULL;
|
||
|
|
UINTN dataSize = 0;
|
||
|
|
EFI_STATUS efi_status;
|
||
|
|
- volatile register UINTN x = 0;
|
||
|
|
+ register volatile UINTN x = 0;
|
||
|
|
extern char _text, _data;
|
||
|
|
|
||
|
|
if (x)
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|