patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Revert "kernel: fix usage of KERNEL_COHERENCE macro"

Browse source 
This reverts commit 67c5e6b0c0.

This is causing build issues on some platforms. Revert for now.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2020-12-08 13:37:54 -05:00
parent cf6fb4dea2
commit 87ddddae52
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/spinlock.h
View file

@ -118,7 +118,7 @@ static ALWAYS_INLINE k_spinlock_key_t k_spin_lock(struct k_spinlock *l)
#ifdef CONFIG_SPIN_VALIDATE
__ASSERT(z_spin_lock_valid(l), "Recursive spinlock %p", l);
# ifdef CONFIG_KERNEL_COHERENCE
# ifdef KERNEL_COHERENCE
__ASSERT_NO_MSG(arch_mem_coherent(l));
# endif
#endif

2
kernel/init.c
View file

@ -157,7 +157,7 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3)
z_init_static_threads();
#ifdef CONFIG_KERNEL_COHERENCE
#ifdef KERNEL_COHERENCE
__ASSERT_NO_MSG(arch_mem_coherent(_kernel));
#endif

4
kernel/sched.c
View file

@ -413,7 +413,7 @@ static void update_cache(int preempt_ok)
static void ready_thread(struct k_thread *thread)
{
#ifdef CONFIG_KERNEL_COHERENCE
#ifdef KERNEL_COHERENCE
__ASSERT_NO_MSG(arch_mem_coherent(thread));
#endif
@ -676,7 +676,7 @@ static void add_thread_timeout(struct k_thread *thread, k_timeout_t timeout)
static void pend(struct k_thread *thread, _wait_q_t *wait_q,
k_timeout_t timeout)
{
#ifdef CONFIG_KERNEL_COHERENCE
#ifdef KERNEL_COHERENCE
__ASSERT_NO_MSG(arch_mem_coherent(wait_q));
#endif

2
kernel/thread.c
View file

@ -571,7 +571,7 @@ char *z_setup_new_thread(struct k_thread *new_thread,
z_init_thread_base(&new_thread->base, prio, _THREAD_PRESTART, options);
stack_ptr = setup_thread_stack(new_thread, stack, stack_size);
#ifdef CONFIG_KERNEL_COHERENCE
#ifdef KERNEL_COHERENCE
/* Check that the thread object is safe, but that the stack is
* still cached!
*/

2
kernel/timeout.c
View file

@ -91,7 +91,7 @@ void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
return;
}
#ifdef CONFIG_KERNEL_COHERENCE
#ifdef KERNEL_COHERENCE
__ASSERT_NO_MSG(arch_mem_coherent(to));
#endif