michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: Move LOCKED() macro to kernel_internal.h

Browse source 
Remove duplication in the code by moving macro LOCKED() to the correct
kernel_internal.h header.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2021-02-19 16:57:02 +02:00 • committed by Anas Nashif
commit 377456c5af
4 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/arc/core/arc_connect.c
View file

@ -13,16 +13,10 @@
#include <kernel.h>
#include <arch/cpu.h>
#include <spinlock.h>
#include <kernel_internal.h>
static struct k_spinlock arc_connect_spinlock;
#define LOCKED(lck) for (k_spinlock_key_t __i = {}, \
__key = k_spin_lock(lck); \
!__i.key; \
k_spin_unlock(lck, __key), __i.key = 1)
/* Generate an inter-core interrupt to the target core */
void z_arc_connect_ici_generate(uint32_t core)
{

5
kernel/include/kernel_internal.h
View file

@ -202,6 +202,11 @@ void z_mem_manage_init(void);
/* Workaround for build-time page table mapping of the kernel */
void z_kernel_map_fixup(void);
#define LOCKED(lck) for (k_spinlock_key_t __i = {}, \
__key = k_spin_lock(lck); \
!__i.key; \
k_spin_unlock(lck, __key), __i.key = 1)
#ifdef __cplusplus
}
#endif

5
kernel/sched.c
View file

@ -60,11 +60,6 @@ static struct k_spinlock sched_spinlock;
static void update_cache(int);
#define LOCKED(lck) for (k_spinlock_key_t __i = {}, \
__key = k_spin_lock(lck); \
!__i.key; \
k_spin_unlock(lck, __key), __i.key = 1)
static inline int is_preempt(struct k_thread *thread)
{
#ifdef CONFIG_PREEMPT_ENABLED

5
kernel/timeout.c
View file

@ -12,11 +12,6 @@
#include <drivers/timer/system_timer.h>
#include <sys_clock.h>
#define LOCKED(lck) for (k_spinlock_key_t __i = {}, \
__key = k_spin_lock(lck); \
__i.key == 0; \
k_spin_unlock(lck, __key), __i.key = 1)
static uint64_t curr_tick;
static sys_dlist_t timeout_list = SYS_DLIST_STATIC_INIT(&timeout_list);