diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-19 09:46:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-19 09:46:57 -0500 |
| commit | 53c47c59e638cc118c272235db516bb541dad0ac (patch) | |
| tree | cd40236202c66c25e6f311f2654ebcfa087ed2b1 /arch/x86/include/asm/global_data.h | |
| parent | 7aec35be4b5fa7aabc0ece03dc8825495d86a1be (diff) | |
| parent | 4c5907889553696160fabaa7e9f0c96ed1fa6597 (diff) | |
Merge tag 'dm-pull-18jan23' of https://source.denx.de/u-boot/custodians/u-boot-dm
convert rockchip to use binman
patman fix for checkpatch
binman optional entries, improved support for ELF symbols
trace improvements
minor fdt refactoring
Diffstat (limited to 'arch/x86/include/asm/global_data.h')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 23693f85a7..22d103df4e 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -137,7 +137,7 @@ struct arch_global_data { #define DECLARE_GLOBAL_DATA_PTR extern struct global_data *global_data_ptr # else -static inline __attribute__((no_instrument_function)) gd_t *get_fs_gd_ptr(void) +static inline notrace gd_t *get_fs_gd_ptr(void) { gd_t *gd_ptr; |