Update

[l4.git] / kernel / fiasco / src / kern / obj_space_virt_util.cpp

diff --git a/kernel/fiasco/src/kern/obj_space_virt_util.cpp b/kernel/fiasco/src/kern/obj_space_virt_util.cpp
index f7eb33e7408c136c71cd6ee8b9cd593db752066e..b0b4af8e201c970e5ce5babffef983d420d14256 100644 (file)
--- a/kernel/fiasco/src/kern/obj_space_virt_util.cpp
+++ b/kernel/fiasco/src/kern/obj_space_virt_util.cpp
@@ -50,7 +50,6 @@ IMPLEMENTATION:
 #include "atomic.h"
 #include "config.h"
 #include "cpu.h"
-#include "kdb_ke.h"
 #include "kmem_alloc.h"
 #include "mem_layout.h"
 
@@ -137,7 +136,7 @@ Obj_space_virt<SPACE>::caps_free()
        continue;
 
       Address cp = Address(ms->virt_to_phys(Address(c)));
-      assert_kdb (cp != ~0UL);
+      assert (cp != ~0UL);
       void *cv = (void*)Mem_layout::phys_to_pmem(cp);
       Obj::remove_cap_page_dbg_info(cv);
 
@@ -156,7 +155,7 @@ Obj_space_virt<SPACE>::caps_free()
 
 IMPLEMENT  template< typename SPACE >
 inline  NEEDS[Obj_space_virt::cap_virt, Obj_space_virt::get_cap]
-bool __attribute__((__flatten__))
+bool FIASCO_FLATTEN
 Obj_space_virt<SPACE>::v_lookup(V_pfn const &virt, Phys_addr *phys,
                                    Page_order *size, Attr *attribs)
 {
@@ -196,7 +195,7 @@ Obj_space_virt<SPACE>::v_lookup(V_pfn const &virt, Phys_addr *phys,
 
 IMPLEMENT template< typename SPACE >
 inline NEEDS [Obj_space_virt::cap_virt, Obj_space_virt::get_cap]
-typename Obj_space_virt<SPACE>::Capability __attribute__((__flatten__))
+typename Obj_space_virt<SPACE>::Capability FIASCO_FLATTEN
 Obj_space_virt<SPACE>::lookup(Cap_index virt)
 {
   Capability *c;
@@ -228,7 +227,7 @@ Obj_space_virt<SPACE>::lookup_local(Cap_index virt, L4_fpage::Rights *rights)
 
 IMPLEMENT template< typename SPACE >
 inline NEEDS[<cassert>, Obj_space_virt::cap_virt, Obj_space_virt::get_cap]
-L4_fpage::Rights __attribute__((__flatten__))
+L4_fpage::Rights FIASCO_FLATTEN
 Obj_space_virt<SPACE>::v_delete(V_pfn virt, Order size,
                                    L4_fpage::Rights page_attribs)
 {
@@ -263,8 +262,8 @@ Obj_space_virt<SPACE>::v_delete(V_pfn virt, Order size,
 
 IMPLEMENT  template< typename SPACE >
 inline NEEDS[Obj_space_virt::cap_virt, Obj_space_virt::caps_alloc,
-             Obj_space_virt::get_cap, "kdb_ke.h"]
-typename Obj::Insert_result __attribute__((__flatten__))
+             Obj_space_virt::get_cap, <cassert>]
+typename Obj::Insert_result FIASCO_FLATTEN
 Obj_space_virt<SPACE>::v_insert(Phys_addr phys, V_pfn const &virt, Order size,
                                 Attr page_attribs)
 {