From 220cf7c44adc77ff7e891eb4f0a5ea7c6fc4a52b Mon Sep 17 00:00:00 2001
From: l4check <l4check@d050ee49-bd90-4346-b210-929a50b99cfc>
Date: Wed, 22 Jun 2011 11:30:27 +0000
Subject: [PATCH] update

git-svn-id: http://svn.tudos.org/repos/oc/tudos/trunk@36 d050ee49-bd90-4346-b210-929a50b99cfc
---
 kernel/fiasco/src/kern/kobject_iface.cpp |  4 ++++
 l4/conf/modules.list                     |  4 ++--
 l4/pkg/crtn/include/initpriorities.h     | 14 ++++++++++----
 l4/pkg/l4re_vfs/include/impl/vfs_impl.h  |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/kernel/fiasco/src/kern/kobject_iface.cpp b/kernel/fiasco/src/kern/kobject_iface.cpp
index 9dba2b074..9d4d69392 100644
--- a/kernel/fiasco/src/kern/kobject_iface.cpp
+++ b/kernel/fiasco/src/kern/kobject_iface.cpp
@@ -21,6 +21,7 @@ public:
   virtual void initiate_deletion(Kobject ***) = 0;
 
   virtual Kobject_mappable *map_root() = 0;
+  virtual ~Kobject_common() = 0;
 };
 
 class Kobject_iface : public Kobject_common
@@ -31,6 +32,9 @@ public:
 
 IMPLEMENTATION:
 
+IMPLEMENT inline 
+Kobject_common::~Kobject_common() {}
+
 PUBLIC static inline
 L4_msg_tag
 Kobject_iface::commit_result(Mword error,
diff --git a/l4/conf/modules.list b/l4/conf/modules.list
index e0327b120..1e9e83c1a 100644
--- a/l4/conf/modules.list
+++ b/l4/conf/modules.list
@@ -72,8 +72,8 @@ module libc_support_misc.so
 module libc_be_socket_noop.so
 module libc_be_l4refile.so
 module libc_be_l4re.so
-module r/libsupc++.so
-module r/libuc_c.so
+module libsupc++.so
+module libuc_c.so
 
 entry L4Linux ARM
 roottask moe rom/l4lx.cfg
diff --git a/l4/pkg/crtn/include/initpriorities.h b/l4/pkg/crtn/include/initpriorities.h
index 3655d7825..510e4536e 100644
--- a/l4/pkg/crtn/include/initpriorities.h
+++ b/l4/pkg/crtn/include/initpriorities.h
@@ -14,6 +14,7 @@
 
 #define INIT_PRIO_EARLY_VAL                 101
 #define INIT_PRIO_L4RE_UTIL_CAP_ALLOC       200
+#define INIT_PRIO_VFS_INIT_VAL              400
 
 #define INIT_PRIO_THREADLIB_UTCB_BITMAP     1001
 #define INIT_PRIO_THREADLIB_INIT_VAL        1002
@@ -21,30 +22,35 @@
 
 #define INIT_PRIO_LIBIO_INIT_VAL            1100
 #define INIT_PRIO_RTC_L4LIBC_INIT_VAL       1200
-#define INIT_PRIO_LATE_VAL                  2000
+#define INIT_PRIO_LATE_VAL                  5000
 
 #ifdef __ARM_EABI__
 
 #define INIT_PRIO_EARLY                     00101
+#define INIT_PRIO_VFS_INIT                  00400
 #define INIT_PRIO_THREADLIB_INIT            01002
 #define INIT_PRIO_LIBC_BE_FILE              01005
 #define INIT_PRIO_LIBIO_INIT                01100
 #define INIT_PRIO_RTC_L4LIBC_INIT           01200
-#define INIT_PRIO_LATE                      02000
+#define INIT_PRIO_LATE                      05000
 
 #else
 
 #define INIT_PRIO_EARLY                     65434
+#define INIT_PRIO_VFS_INIT                  65135
 #define INIT_PRIO_THREADLIB_INIT            64533
 #define INIT_PRIO_LIBC_BE_FILE              64530
 #define INIT_PRIO_LIBIO_INIT                64435
 #define INIT_PRIO_RTC_L4LIBC_INIT           64335
-#define INIT_PRIO_LATE                      63535
+#define INIT_PRIO_LATE                      60535
 
 /* Assertions on the rev priorities */
 #if INIT_PRIO_EARLY + INIT_PRIO_EARLY_VAL != 65535
 #error INIT_PRIO_EARLY mis-match
 #endif
+#if INIT_PRIO_VFS_INIT + INIT_PRIO_VFS_INIT_VAL != 65535
+#error INIT_PRIO_VFS_INIT mis-match
+#endif
 #if INIT_PRIO_THREADLIB_INIT + INIT_PRIO_THREADLIB_INIT_VAL != 65535
 #error INIT_PRIO_THREADLIB mis-match
 #endif
@@ -52,7 +58,7 @@
 #error INIT_PRIO_LIBC_BE_FILE mis-match
 #endif
 #if INIT_PRIO_LIBIO_INIT + INIT_PRIO_LIBIO_INIT_VAL != 65535
-#error INIT_PRIO_THREADLIB mis-match
+#error INIT_PRIO_LIBIO_INIT mis-match
 #endif
 #if INIT_PRIO_RTC_L4LIBC_INIT + INIT_PRIO_RTC_L4LIBC_INIT_VAL != 65535
 #error INIT_PRIO_RTC_L4LIBC_INIT mis-match
diff --git a/l4/pkg/l4re_vfs/include/impl/vfs_impl.h b/l4/pkg/l4re_vfs/include/impl/vfs_impl.h
index 5689e4ec4..ff92c310e 100644
--- a/l4/pkg/l4re_vfs/include/impl/vfs_impl.h
+++ b/l4/pkg/l4re_vfs/include/impl/vfs_impl.h
@@ -763,7 +763,7 @@ namespace {
 // our VFS main object is ever called!
 static char vfs_cnt[sizeof(Vfs)] __attribute__((aligned(sizeof(long))));
 static void init_vfs() { new (vfs_cnt) Vfs(); }
-L4_DECLARE_CONSTRUCTOR(init_vfs, INIT_PRIO_EARLY);
+L4_DECLARE_CONSTRUCTOR(init_vfs, INIT_PRIO_VFS_INIT);
 }
 
 }
-- 
2.39.2