diff options
| author | Peter Jones <pjones@redhat.com> | 2021-07-02 13:11:59 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-07-20 09:44:25 -0400 |
| commit | 3ecfa301f4a8c4c2168f95f27d0313f4158ab53d (patch) | |
| tree | b382cad601a11b1f3e501b4f8ca8e132015f0353 | |
| parent | 352a741bc5fa9a71776d56750f51d80f9f2e808f (diff) | |
| download | efi-boot-shim-3ecfa301f4a8c4c2168f95f27d0313f4158ab53d.tar.gz efi-boot-shim-3ecfa301f4a8c4c2168f95f27d0313f4158ab53d.zip | |
shim: rename pause() to wait_for_debug()
pause() is a posix function, and having it named the same as this makes
it hard to include the asm.h header in some test cases.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/asm.h | 6 | ||||
| -rw-r--r-- | shim.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm.h b/include/asm.h index 8458d5d2..03b06557 100644 --- a/include/asm.h +++ b/include/asm.h @@ -26,17 +26,17 @@ static inline uint64_t read_counter(void) } #if defined(__x86_64__) || defined(__i386__) || defined(__i686__) -static inline void pause(void) +static inline void wait_for_debug(void) { __asm__ __volatile__("pause"); } #elif defined(__aarch64__) -static inline void pause(void) +static inline void wait_for_debug(void) { __asm__ __volatile__("wfi"); } #else -static inline void pause(void) +static inline void wait_for_debug(void) { uint64_t a, b; int x; @@ -1817,7 +1817,7 @@ debug_hook(void) if (x > 12000) break; #endif - pause(); + wait_for_debug(); } x = 1; } |
