mirror of
https://github.com/t-crest/rtems.git
synced 2025-11-16 04:24:46 +00:00
Fixed merge conflict
This commit is contained in:
5
c/src/lib/libcpu/patmos/cache/cache.c
vendored
5
c/src/lib/libcpu/patmos/cache/cache.c
vendored
@@ -13,11 +13,6 @@
|
||||
/* XXX these need to be addressed */
|
||||
void _CPU_cache_invalidate_entire_instruction ( void )
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// No flush instruction at the moment
|
||||
//asm volatile ("flush");
|
||||
>>>>>>> 0524f11f213c4b1a72cf113f24422977a9bae877
|
||||
}
|
||||
|
||||
void _CPU_cache_freeze_instruction ( void )
|
||||
|
||||
Reference in New Issue
Block a user