From 58bced64b93ff88d91c719854a36f947d5c28ebb Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 9 Nov 2016 15:16:03 +0100 Subject: score: Move _CPU_Get_current_per_CPU_control() Move _CPU_Get_current_per_CPU_control() from to . --- cpukit/score/cpu/sparc/rtems/score/cpu.h | 8 -------- cpukit/score/cpu/sparc/rtems/score/cpuimpl.h | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cpukit/score/cpu/sparc/rtems/score') diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index 5823544a80..a97d330665 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h @@ -1185,14 +1185,6 @@ void _CPU_Context_restore( Context_Control *new_context ) RTEMS_NO_RETURN; -/** - * @brief The pointer to the current per-CPU control is available via register - * g6. - */ -register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" ); - -#define _CPU_Get_current_per_CPU_control() _SPARC_Per_CPU_current - #if defined(RTEMS_SMP) uint32_t _CPU_SMP_Initialize( void ); diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h index 5373db190c..bb53bf996f 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016 embedded brains GmbH. + * Copyright (c) 2015, 2016 embedded brains GmbH * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -23,6 +23,14 @@ extern "C" { #endif +/** + * @brief The pointer to the current per-CPU control is available via register + * g6. + */ +register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" ); + +#define _CPU_Get_current_per_CPU_control() _SPARC_Per_CPU_current + #define _CPU_Get_thread_executing() ( _SPARC_Per_CPU_current->executing ) #ifdef __cplusplus -- cgit v1.2.3