diff options
Diffstat (limited to 'src/include/cpu/x86')
-rw-r--r-- | src/include/cpu/x86/bist.h | 2 | ||||
-rw-r--r-- | src/include/cpu/x86/msr.h | 10 | ||||
-rw-r--r-- | src/include/cpu/x86/tsc.h | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h index 648a789bd8..24d402545f 100644 --- a/src/include/cpu/x86/bist.h +++ b/src/include/cpu/x86/bist.h @@ -4,7 +4,7 @@ static void report_bist_failure(u32 bist) { if (bist != 0) { - printk(BIOS_EMERG, "BIST failed: %08x", bist); + printk(BIOS_EMERG, "BIST failed: %08x", bist); die("\n"); } } diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h index db35ef14eb..f830f3ba3b 100644 --- a/src/include/cpu/x86/msr.h +++ b/src/include/cpu/x86/msr.h @@ -25,8 +25,8 @@ typedef struct msr_struct typedef struct msrinit_struct { - unsigned index; - msr_t msr; + unsigned index; + msr_t msr; } msrinit_t; #if IS_ENABLED(CONFIG_SOC_SETS_MSRS) @@ -39,8 +39,7 @@ static inline __attribute__((always_inline)) msr_t rdmsr(unsigned index) return soc_msr_read(index); } -static inline __attribute__((always_inline)) void wrmsr(unsigned index, - msr_t msr) +static inline __attribute__((always_inline)) void wrmsr(unsigned index, msr_t msr) { soc_msr_write(index, msr); } @@ -67,8 +66,7 @@ static inline __attribute__((always_inline)) msr_t rdmsr(unsigned index) return result; } -static inline __attribute__((always_inline)) void wrmsr(unsigned index, - msr_t msr) +static inline __attribute__((always_inline)) void wrmsr(unsigned index, msr_t msr) { __asm__ __volatile__ ( "wrmsr" diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 5cf4644328..e4ca0e768f 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -56,7 +56,7 @@ static inline unsigned long long rdtscll(void) static inline uint64_t tsc_to_uint64(tsc_t tstamp) { - return (((uint64_t)tstamp.hi) << 32) + tstamp.lo; + return (((uint64_t)tstamp.hi) << 32) + tstamp.lo; } #endif |