diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-07 22:58:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-07 22:58:18 -0400 |
| commit | 0b59138690a93f3d880be3d5aa675f7219376e58 (patch) | |
| tree | b139bf8d951a50c2196f3f36dc2f5ab2f3bb1cc7 /lib/trace.c | |
| parent | 1e88e78177da80fa8e9fa9fc7613657478d61d1e (diff) | |
| parent | 9b9f10e3ccded02443162980d34be517886b0645 (diff) | |
Merge branch '2020-07-07-misc-new-features'
- Improve s700 SoC support
- Fix building with clang on ARM.
- Juno platform updates
- fs/dm cmd improvements
- Other assorted improvements / fixes
Diffstat (limited to 'lib/trace.c')
| -rw-r--r-- | lib/trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/trace.c b/lib/trace.c index ea8c8e0d406..831283c283d 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -57,12 +57,12 @@ static inline uintptr_t __attribute__((no_instrument_function)) return offset / FUNC_SITE_SIZE; } -#ifdef CONFIG_EFI_LOADER +#if defined(CONFIG_EFI_LOADER) && defined(CONFIG_ARM) /** * trace_gd - the value of the gd register */ -static volatile void *trace_gd; +static volatile gd_t *trace_gd; /** * trace_save_gd() - save the value of the gd register @@ -82,10 +82,10 @@ static void __attribute__((no_instrument_function)) trace_save_gd(void) */ static void __attribute__((no_instrument_function)) trace_swap_gd(void) { - volatile void *temp_gd = trace_gd; + volatile gd_t *temp_gd = trace_gd; trace_gd = gd; - gd = temp_gd; + set_gd(temp_gd); } #else |