Imagelibrary/rtems-patmos
1
0
Fork 0
mirror of https://github.com/t-crest/rtems.git synced 2025-12-05 15:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Stefan Hepp
2014-03-18 15:10:05 +01:00
parent 1c1b68be2f
commit e4358226c4
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libcpu/patmos/cache/cache.c vendored
View File

@@ -13,11 +13,6 @@
/* XXX these need to be addressed */ /* XXX these need to be addressed */
void _CPU_cache_invalidate_entire_instruction ( void ) void _CPU_cache_invalidate_entire_instruction ( void )
{ {
<<<<<<< HEAD
=======
// No flush instruction at the moment
//asm volatile ("flush");
>>>>>>> 0524f11f213c4b1a72cf113f24422977a9bae877
} }
void _CPU_cache_freeze_instruction ( void ) void _CPU_cache_freeze_instruction ( void )