summaryrefslogtreecommitdiff
path: root/viengoos
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@gnu.org>2009-01-20 05:25:51 +0100
committerNeal H. Walfield <neal@gnu.org>2009-01-20 05:25:51 +0100
commit9a6bdb4803109960d632655bb1d1828476d9bf33 (patch)
tree96e3cad694b288e2ddba69a8be11ad0b14b5cf5b /viengoos
parent931721e2dfbcaef19bec5eabe3dbfb40d5c361fd (diff)
Enable more code.
Diffstat (limited to 'viengoos')
-rw-r--r--viengoos/activity.c2
-rw-r--r--viengoos/cap.c2
-rw-r--r--viengoos/memory.c2
-rw-r--r--viengoos/messenger.c3
-rw-r--r--viengoos/object.c5
-rw-r--r--viengoos/pager.c3
-rw-r--r--viengoos/server.c2
-rw-r--r--viengoos/thread.c3
-rw-r--r--viengoos/zalloc.c2
9 files changed, 6 insertions, 18 deletions
diff --git a/viengoos/activity.c b/viengoos/activity.c
index 9c31d10..44fb5d4 100644
--- a/viengoos/activity.c
+++ b/viengoos/activity.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#include <errno.h>
#include <assert.h>
#include <viengoos/cap.h>
@@ -467,4 +466,3 @@ activity_dump (struct activity *activity)
do_activity_dump (activity, 0);
}
}
-#endif
diff --git a/viengoos/cap.c b/viengoos/cap.c
index f254ceb..80c5d34 100644
--- a/viengoos/cap.c
+++ b/viengoos/cap.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#include <assert.h>
#include <hurd/stddef.h>
#include <viengoos/messenger.h>
@@ -220,4 +219,3 @@ cap_shootdown (struct activity *activity, struct vg_cap *root)
doit (root, VG_ADDR_BITS);
}
-#endif
diff --git a/viengoos/memory.c b/viengoos/memory.c
index 42907be..e3fbdff 100644
--- a/viengoos/memory.c
+++ b/viengoos/memory.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#include "memory.h"
#include "pager.h"
#include "activity.h"
@@ -394,4 +393,3 @@ memory_frame_free (uintptr_t addr)
zfree (addr, PAGESIZE);
}
-#endif
diff --git a/viengoos/messenger.c b/viengoos/messenger.c
index 72dc4df..b167b38 100644
--- a/viengoos/messenger.c
+++ b/viengoos/messenger.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#include <stdbool.h>
#include <errno.h>
#include <assert.h>
@@ -346,4 +345,4 @@ messenger_destroy (struct activity *activity, struct messenger *messenger)
/* MESSENGER is attached to a wait queue. Detach it. */
object_wait_queue_unlink (activity, messenger);
}
-#endif
+
diff --git a/viengoos/object.c b/viengoos/object.c
index f30ba49..45d2573 100644
--- a/viengoos/object.c
+++ b/viengoos/object.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#ifdef USE_L4
# include <l4.h>
#endif
@@ -88,7 +87,7 @@ object_init (void)
panic ("Failed to allocate memory for object hash!\n");
hurd_ihash_init_with_buffer (&objects, true,
- (int) (&((struct object_desc *)0)->locp),
+ (uintptr_t) (&((struct object_desc *)0)->locp),
buffer, size);
@@ -1348,4 +1347,4 @@ object_wait_queue_unlink (struct activity *activity,
object_wait_queue_check (activity, messenger);
}
-#endif
+
diff --git a/viengoos/pager.c b/viengoos/pager.c
index d03379b..41f4bef 100644
--- a/viengoos/pager.c
+++ b/viengoos/pager.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#include "memory.h"
#include "zalloc.h"
#include "activity.h"
@@ -563,4 +562,4 @@ pager_collect (int goal)
return total_freed;
}
-#endif
+
diff --git a/viengoos/server.c b/viengoos/server.c
index aab7f1e..34a15a5 100644
--- a/viengoos/server.c
+++ b/viengoos/server.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#ifdef USE_L4
#include <l4.h>
#include <l4/pagefault.h>
@@ -49,6 +48,7 @@
struct futex_waiter_list futex_waiters;
#endif
+#if 0
#ifndef NDEBUG
struct trace_buffer rpc_trace = TRACE_BUFFER_INIT ("rpcs", 0,
diff --git a/viengoos/thread.c b/viengoos/thread.c
index 716aa37..cd9d70e 100644
--- a/viengoos/thread.c
+++ b/viengoos/thread.c
@@ -18,7 +18,6 @@
along with this program. If not, see
<http://www.gnu.org/licenses/>. */
-#if 0
#ifdef USE_L4
# include <l4.h>
# include <l4/thread-start.h>
@@ -696,4 +695,4 @@ thread_deliver_pending (struct activity *activity,
utcb->pending_message = 0;
}
-#endif
+
diff --git a/viengoos/zalloc.c b/viengoos/zalloc.c
index 699eec4..adc75de 100644
--- a/viengoos/zalloc.c
+++ b/viengoos/zalloc.c
@@ -23,7 +23,6 @@
#include <config.h>
#endif
-#if 0
#include <assert.h>
#include <string.h>
#include <stdint.h>
@@ -307,4 +306,3 @@ zalloc_dump_zones (const char *prefix)
assertx (available == zalloc_memory, "%d != %d", available, zalloc_memory);
}
#endif
-#endif