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 | |
| parent | 7aec35be4b5fa7aabc0ece03dc8825495d86a1be (diff) | |
| parent | 4c5907889553696160fabaa7e9f0c96ed1fa6597 (diff) | |
| download | u-boot-53c47c59e638cc118c272235db516bb541dad0ac.zip u-boot-53c47c59e638cc118c272235db516bb541dad0ac.tar.gz u-boot-53c47c59e638cc118c272235db516bb541dad0ac.tar.bz2 | |
Merge tag 'dm-pull-18jan23' of https://source.denx.de/u-boot/custodians/u-boot-dmWIP/19Jan2023
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')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/msr.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 23693f8..22d103d 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; diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 3e613de..27764fc 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -71,7 +71,7 @@ static inline unsigned long long native_read_tscp(unsigned int *aux) #define EAX_EDX_RET(val, low, high) "=A" (val) #endif -static inline __attribute__((no_instrument_function)) +static inline notrace unsigned long long native_read_msr(unsigned int msr) { DECLARE_ARGS(val, low, high); diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 4cf41e9..8f38c2d 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -108,7 +108,7 @@ void board_init_f_r(void) __attribute__ ((noreturn)); int arch_misc_init(void); /* Read the time stamp counter */ -static inline __attribute__((no_instrument_function)) uint64_t rdtsc(void) +static inline notrace uint64_t rdtsc(void) { uint32_t high, low; __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)); |