diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/bootblock_common.h | 4 | ||||
| -rw-r--r-- | src/include/cbmem.h | 36 | ||||
| -rw-r--r-- | src/include/cpu/cpu.h | 2 | ||||
| -rw-r--r-- | src/include/cpu/intel/romstage.h | 2 | ||||
| -rw-r--r-- | src/include/cpu/x86/smm.h | 2 | ||||
| -rw-r--r-- | src/include/thread.h | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 04fc0cbfd5..6ede77c965 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -33,7 +33,7 @@ void bootblock_soc_init(void); /* * C code entry point for the boot block. */ -void asmlinkage bootblock_c_entry(uint64_t base_timestamp); +asmlinkage void bootblock_c_entry(uint64_t base_timestamp); /* * This is a the same as the bootblock main(), with the difference that it does @@ -43,6 +43,6 @@ void asmlinkage bootblock_c_entry(uint64_t base_timestamp); * This function assumes that the timer has already been initialized, so it * does not call init_timer(). */ -void asmlinkage bootblock_main_with_timestamp(uint64_t base_timestamp); +asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp); #endif /* __BOOTBLOCK_COMMON_H */ diff --git a/src/include/cbmem.h b/src/include/cbmem.h index 71e44d384d..0fe25c1741 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -112,36 +112,36 @@ void cbmem_list(void); void cbmem_add_records_to_cbtable(struct lb_header *header); #if ENV_RAMSTAGE -#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused_ __attribute__((unused)) = init_fn_; +#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused_ = init_fn_; #define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) \ static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \ section(".rodata.cbmem_init_hooks"))) = init_fn_; -#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_; +#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused2_ = init_fn_; #elif ENV_ROMSTAGE #define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) \ static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \ section(".rodata.cbmem_init_hooks"))) = init_fn_; -#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused_ __attribute__((unused)) = init_fn_; -#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_; +#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused_ = init_fn_; +#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused2_ = init_fn_; #elif ENV_POSTCAR -#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_; -#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused_ __attribute__((unused)) = init_fn_; +#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused2_ = init_fn_; +#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused_ = init_fn_; #define POSTCAR_CBMEM_INIT_HOOK(init_fn_) \ static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \ section(".rodata.cbmem_init_hooks"))) = init_fn_; #else -#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused_ __attribute__((unused)) = init_fn_; -#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused2_ __attribute__((unused)) = init_fn_; -#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \ - init_fn_ ## _unused3_ __attribute__((unused)) = init_fn_; +#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused_ = init_fn_; +#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused2_ = init_fn_; +#define POSTCAR_CBMEM_INIT_HOOK(init_fn_) __attribute__((unused)) \ + static cbmem_init_hook_t init_fn_ ## _unused3_ = init_fn_; #endif /* ENV_RAMSTAGE */ diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index d5468549d7..a78dd2f425 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -7,7 +7,7 @@ void cpu_initialize(unsigned int cpu_index); struct bus; void initialize_cpus(struct bus *cpu_bus); -void asmlinkage secondary_cpu_init(unsigned int cpu_index); +asmlinkage void secondary_cpu_init(unsigned int cpu_index); int cpu_phys_address_size(void); #define __cpu_driver __attribute__ ((used, __section__(".rodata.cpu_driver"))) diff --git a/src/include/cpu/intel/romstage.h b/src/include/cpu/intel/romstage.h index 0dd02ce355..3a9e98934b 100644 --- a/src/include/cpu/intel/romstage.h +++ b/src/include/cpu/intel/romstage.h @@ -27,6 +27,6 @@ void *setup_stack_and_mtrrs(void); asmlinkage void *romstage_main(unsigned long bist); /* romstage_after_car() is the C function called after cache-as-ram has * been torn down. It is responsible for loading the ramstage. */ -void asmlinkage romstage_after_car(void); +asmlinkage void romstage_after_car(void); #endif /* _CPU_INTEL_ROMSTAGE_H */ diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index f07cac35cf..48c4c0ba01 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -517,7 +517,7 @@ typedef asmlinkage void (*smm_handler_t)(void *); /* SMM Runtime helpers. */ /* Entry point for SMM modules. */ -void asmlinkage smm_handler_start(void *params); +asmlinkage void smm_handler_start(void *params); /* Retrieve SMM save state for a given CPU. WARNING: This does not take into * account CPUs which are configured to not save their state to RAM. */ diff --git a/src/include/thread.h b/src/include/thread.h index d2006359d5..586fb3afd0 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -65,7 +65,7 @@ static inline void thread_init_cpu_info_non_bsp(struct cpu_info *ci) } /* Architecture specific thread functions. */ -void asmlinkage switch_to_thread(uintptr_t new_stack, uintptr_t *saved_stack); +asmlinkage void switch_to_thread(uintptr_t new_stack, uintptr_t *saved_stack); /* Set up the stack frame for a new thread so that a switch_to_thread() call * will enter the thread_entry() function with arg as a parameter. The * saved_stack field in the struct thread needs to be updated accordingly. */ |