update

[l4.git] / kernel / fiasco / src / kern / arm / thread-arm.cpp

diff --git a/kernel/fiasco/src/kern/arm/thread-arm.cpp b/kernel/fiasco/src/kern/arm/thread-arm.cpp
index 653702dcadd5e65a66b2b18281a9636b820ba97a..f392bc2d0d18453bbd9dc9493e8d932febb53d33 100644 (file)
--- a/kernel/fiasco/src/kern/arm/thread-arm.cpp
+++ b/kernel/fiasco/src/kern/arm/thread-arm.cpp
@@ -15,9 +15,9 @@ IMPLEMENTATION [arm]:
 #include <cassert>
 #include <cstdio>
 
-#include "cache.h"
 #include "globals.h"
 #include "kmem_space.h"
+#include "mem_op.h"
 #include "static_assert.h"
 #include "thread_state.h"
 #include "types.h"
@@ -199,7 +199,7 @@ extern "C" {
 
     // cache operations we carry out for user space might cause PFs, we just
     // ignore those
-    if (EXPECT_FALSE(t->is_cache_op_in_progress()))
+    if (EXPECT_FALSE(t->is_mem_op_in_progress()))
       {
         ret_frame->pc += 4;
         return 1;
@@ -225,8 +225,8 @@ extern "C" {
             && ts->r[7] == 0xf0002)
          {
             if (ts->r[2] == 0)
-              Cache_op::arm_cache_maint(Cache_op::Op_coherent,
-                                        (void *)ts->r[0], (void *)ts->r[1]);
+              Mem_op::arm_mem_cache_maint(Mem_op::Op_cache_coherent,
+                                          (void *)ts->r[0], (void *)ts->r[1]);
             return;
          }
       }