diff options
| author | Han Shen <shenhan@google.com> | 2012-10-16 10:42:25 -0700 |
|---|---|---|
| committer | Anton Kochkov <anton.kochkov@gmail.com> | 2012-11-12 07:39:31 +0100 |
| commit | a571c70c14a86d242be39fc12610b2519499379f (patch) | |
| tree | 7e6f9e5191d0ffb26b8e256db56243ba43367665 | |
| parent | 4a17d29fe8003fd2c47cde0672ddf1066aa61f6a (diff) | |
Fix gcc-4.7 building problem.
Applied function attribute to function definition to avoid 'conflicting type' warning.
Function declaration is in src/include/cpu.h
void secondary_cpu_init(unsigned int cpu_index)__attribute__((regparm(0)));
But function definition in lapic_cpu_init.c is missing the "__attribute__" part.
Change-Id: Idb7cd00fda5a2d486893f9866920929c685d266e
Signed-off-by: Han Shen <shenhan@google.com>
Reviewed-on: http://review.coreboot.org/1784
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
| -rw-r--r-- | src/cpu/x86/lapic/lapic_cpu_init.c | 2 | ||||
| -rw-r--r-- | src/include/cpu/cpu.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index fc5a7861e1..b721e8f9b0 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -373,7 +373,7 @@ static __inline__ __attribute__((always_inline)) void writecr4(unsigned long Dat #endif /* C entry point of secondary cpus */ -void secondary_cpu_init(void) +void __attribute__((regparm(0))) secondary_cpu_init(void) { atomic_inc(&active_cpus); #if CONFIG_SERIAL_CPU_INIT diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 34ba61ec26..a9369fbf76 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -7,7 +7,7 @@ void cpu_initialize(void); struct bus; void initialize_cpus(struct bus *cpu_bus); -void secondary_cpu_init(void); +void __attribute__((regparm(0))) secondary_cpu_init(void); #if CONFIG_HAVE_SMI_HANDLER void smm_init(void); |