From fecaeca18bdb4f02d6775f4bbfee7278643ca04e Mon Sep 17 00:00:00 2001 From: Daniel Cederman Date: Mon, 25 Aug 2014 12:59:34 +0200 Subject: score: Define _CPU_Start_multitasking only for LEON SPARC, not SPARC in general Rename _BSP_Start_multitasking to _LEON3_Start_multitasking to show that it is LEON specific --- c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c | 2 +- cpukit/score/cpu/sparc/rtems/score/cpu.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c index 9166ad5630..b7c347e451 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c @@ -82,7 +82,7 @@ void _CPU_SMP_Send_interrupt(uint32_t target_processor_index) LEON3_IrqCtrl_Regs->force[target_processor_index] = 1 << LEON3_MP_IRQ; } -void _BSP_Start_multitasking( +void _LEON3_Start_multitasking( Context_Control *heir ) { diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index 9c38b55e7d..e44ab71f33 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h @@ -1203,9 +1203,11 @@ register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" ); void _CPU_SMP_Send_interrupt( uint32_t target_processor_index ); - void _BSP_Start_multitasking( Context_Control *heir ) + #if defined(__leon__) + void _LEON3_Start_multitasking( Context_Control *heir ) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE; - #define _CPU_Start_multitasking _BSP_Start_multitasking + #define _CPU_Start_multitasking _LEON3_Start_multitasking + #endif static inline void _CPU_SMP_Processor_event_broadcast( void ) { -- cgit v1.2.3