diff options
Diffstat (limited to 'src/arch/x86/include')
| -rw-r--r-- | src/arch/x86/include/arch/cpu.h | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/early_variables.h | 9 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/ebda.h | 6 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/smp/spinlock.h | 3 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/stages.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index e59eb32678..06e4435699 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -249,7 +249,7 @@ static inline void get_fms(struct cpuinfo_x86 *c, uint32_t tfms) * is the symbol jumped to for each stage after bootblock using * cache-as-ram. */ -void asmlinkage car_stage_entry(void); +asmlinkage void car_stage_entry(void); /* * Support setting up a stack frame consisting of MTRR information diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index b48848e4a3..a21781996e 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -54,11 +54,10 @@ void *car_sync_var_ptr(void *var); /* Get and set a primitive type global variable. */ #define car_get_var(var) \ - *(typeof(var) *)car_get_var_ptr(&(var)) + (*(typeof(var) *)car_get_var_ptr(&(var))) #define car_sync_var(var) \ - *(typeof(var) *)car_sync_var_ptr(&(var)) -#define car_set_var(var, val) \ - do { car_get_var(var) = (val); } while (0) + (*(typeof(var) *)car_sync_var_ptr(&(var))) +#define car_set_var(var, val) car_get_var(var) = (val) static inline size_t car_data_size(void) { @@ -76,7 +75,7 @@ static inline size_t car_object_offset(void *ptr) static inline void *car_get_var_ptr(void *var) { return var; } #define car_get_var(var) (var) #define car_sync_var(var) (var) -#define car_set_var(var, val) do { (var) = (val); } while (0) +#define car_set_var(var, val) (var) = (val) #endif #endif diff --git a/src/arch/x86/include/arch/ebda.h b/src/arch/x86/include/arch/ebda.h index 116603437c..cd25ccaba1 100644 --- a/src/arch/x86/include/arch/ebda.h +++ b/src/arch/x86/include/arch/ebda.h @@ -18,9 +18,9 @@ #define __ARCH_EBDA_H #define X86_BDA_SIZE 0x200 -#define X86_BDA_BASE (void *)0x400 -#define X86_EBDA_SEGMENT (void *)0x40e -#define X86_EBDA_LOWMEM (void *)0x413 +#define X86_BDA_BASE ((void *)0x400) +#define X86_EBDA_SEGMENT ((void *)0x40e) +#define X86_EBDA_LOWMEM ((void *)0x413) #define DEFAULT_EBDA_LOWMEM (1024 << 10) #define DEFAULT_EBDA_SEGMENT 0xF600 diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h index 716de15d15..1c1def1252 100644 --- a/src/arch/x86/include/arch/smp/spinlock.h +++ b/src/arch/x86/include/arch/smp/spinlock.h @@ -39,7 +39,8 @@ void initialize_romstage_microcode_cbfs_lock(void); #define SPIN_LOCK_UNLOCKED { 1 } #ifndef __PRE_RAM__ -#define DECLARE_SPIN_LOCK(x) static spinlock_t x = SPIN_LOCK_UNLOCKED; +#define DECLARE_SPIN_LOCK(x) \ + static spinlock_t x = SPIN_LOCK_UNLOCKED; #else #define DECLARE_SPIN_LOCK(x) #endif diff --git a/src/arch/x86/include/arch/stages.h b/src/arch/x86/include/arch/stages.h index 49921ae0e1..5716030274 100644 --- a/src/arch/x86/include/arch/stages.h +++ b/src/arch/x86/include/arch/stages.h @@ -18,6 +18,6 @@ #include <arch/cpu.h> -void asmlinkage copy_and_run(void); +asmlinkage void copy_and_run(void); #endif |