diff options
Diffstat (limited to 'src/arch/arm/include')
| -rw-r--r-- | src/arch/arm/include/arch/hlt.h | 4 | ||||
| -rw-r--r-- | src/arch/arm/include/smp/spinlock.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm/include/arch/hlt.h b/src/arch/arm/include/arch/hlt.h index a6a67576fd..fd2aac9c9f 100644 --- a/src/arch/arm/include/arch/hlt.h +++ b/src/arch/arm/include/arch/hlt.h @@ -14,7 +14,9 @@ #ifndef ARCH_HLT_H #define ARCH_HLT_H -static inline __attribute__((always_inline)) void hlt(void) +#include <compiler.h> + +static __always_inline void hlt(void) { for (;;) ; } diff --git a/src/arch/arm/include/smp/spinlock.h b/src/arch/arm/include/smp/spinlock.h index f98900a66b..189bf2c507 100644 --- a/src/arch/arm/include/smp/spinlock.h +++ b/src/arch/arm/include/smp/spinlock.h @@ -33,7 +33,7 @@ typedef struct { #define spin_is_locked(x) (*(volatile char *)(&(x)->lock) != 0) #define spin_unlock_wait(x) do { barrier(); } while (spin_is_locked(x)) -static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock) +static __always_inline void spin_lock(spinlock_t *lock) { unsigned long tmp; __asm__ __volatile__ ( @@ -49,7 +49,7 @@ static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock) barrier(); } -static inline __attribute__((always_inline)) void spin_unlock(spinlock_t *lock) +static __always_inline void spin_unlock(spinlock_t *lock) { __asm__ __volatile__( " str %1, [%0]\n" |