2004-11-01 Marcus Brinkmann <marcus@gnu.org>

	* wortel.h (wortel_get_cap_reply, wortel_get_task_cap_reply,
	wortel_get_deva_cap_reply): Remove unused variable NR_THREADS.
	* wortel.c (start_elf): Remove unused variable min_page_size.
	(start_elf): Add parentheses to silence gcc warning.  Change
	format string to match argument.
	(serve_bootstrap_requests): Initialize bootstrap_final_physmem and
	bootstrap_final_task.

3 files changed, 14 insertions, 8 deletions

diff --git a/wortel/ChangeLog b/wortel/ChangeLog
index 6030c27..17d20f0 100644
--- a/wortel/ChangeLog
+++ b/wortel/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-01  Marcus Brinkmann  <marcus@gnu.org>
+
+	* wortel.h (wortel_get_cap_reply, wortel_get_task_cap_reply,
+	wortel_get_deva_cap_reply): Remove unused variable NR_THREADS.
+	* wortel.c (start_elf): Remove unused variable min_page_size.
+	(start_elf): Add parentheses to silence gcc warning.  Change
+	format string to match argument.
+	(serve_bootstrap_requests): Initialize bootstrap_final_physmem and
+	bootstrap_final_task.
+
 2004-10-28  Marcus Brinkmann  <marcus@gnu.org>
 
 	* wortel.h: Include <stdbool.h>.
diff --git a/wortel/wortel.c b/wortel/wortel.c
index 0ba8474..6113e13 100644
--- a/wortel/wortel.c
+++ b/wortel/wortel.c
@@ -568,7 +568,6 @@ start_elf (unsigned int mod)
        appropriate offsets to go along with.  The physmem server will
        take care of that - which means that he may return a smaller
        mapping than requested.  */
-    l4_word_t min_page_size = l4_min_page_size ();
     /* Get the memory range to which the ELF image from START to END
        (exclusive) will be loaded.  NAME is used for panic
        messages.  */
@@ -667,7 +666,7 @@ start_elf (unsigned int mod)
 		    phys_mapv->size = memsz - filesz;
 		    /* The dirty hack here causes physmem to allocate
 		       anonymous memory.  */
-		    phys_mapv->offset = l4_page_trunc (ph->p_vaddr) + filesz
+		    phys_mapv->offset = (l4_page_trunc (ph->p_vaddr) + filesz)
 		      | ((ph->p_flags & PF_X) ? L4_FPAGE_EXECUTABLE : 0)
 		      | ((ph->p_flags & PF_W) ? L4_FPAGE_WRITABLE : 0)
 		      | ((ph->p_flags & PF_R) ? L4_FPAGE_READABLE : 0);
@@ -805,7 +804,7 @@ start_elf (unsigned int mod)
       panic ("Message from task thread is not a page fault");
     addr = l4_pagefault (tag, NULL, NULL);
     if (addr != (l4_word_t) STARTUP_TO_VIRT (entry_point))
-      panic ("Page fault at unexpected address 0x%x (expected 0x%x)",
+      panic ("Page fault at unexpected address 0x%x (expected 0x%p)",
 	     addr, STARTUP_TO_VIRT (entry_point));
 
     /* The memory was already requested from sigma0 by
@@ -874,8 +873,8 @@ serve_bootstrap_requests (void)
   unsigned int cur_cont = 0;
 
   /* These are the threads that sent us the BOOTSTRAP_FINAL RPC.  */
-  l4_thread_id_t bootstrap_final_physmem;
-  l4_thread_id_t bootstrap_final_task;
+  l4_thread_id_t bootstrap_final_physmem = l4_nilthread;
+  l4_thread_id_t bootstrap_final_task = l4_nilthread;
 
   /* This is to keep information about created task caps.  */
   unsigned int cur_task = (unsigned int) -1;
diff --git a/wortel/wortel.h b/wortel/wortel.h
index fa3f00c..92ca714 100644
--- a/wortel/wortel.h
+++ b/wortel/wortel.h
@@ -316,7 +316,6 @@ __attribute__((always_inline))
 wortel_get_cap_reply (hurd_cap_handle_t handle)
 {
   l4_msg_tag_t tag;
-  l4_word_t nr_threads;
   
   l4_accept (L4_UNTYPED_WORDS_ACCEPTOR);
 
@@ -408,7 +407,6 @@ __attribute__((always_inline))
 wortel_get_task_cap_reply (hurd_cap_handle_t handle)
 {
   l4_msg_tag_t tag;
-  l4_word_t nr_threads;
   
   l4_accept (L4_UNTYPED_WORDS_ACCEPTOR);
 
@@ -452,7 +450,6 @@ __attribute__((always_inline))
 wortel_get_deva_cap_reply (hurd_cap_handle_t handle)
 {
   l4_msg_tag_t tag;
-  l4_word_t nr_threads;
   
   l4_accept (L4_UNTYPED_WORDS_ACCEPTOR);