hurd-l4/wortel ChangeLog wortel.c

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/10/02 06:39:37

Modified files:
        wortel         : ChangeLog wortel.c 

Log message:
        2003-10-01  Johan Rydberg  <address@hidden>
        
        * wortel.c (serve_bootstrap_requests): Only throw away page zero
        if it list as conventinal in memory descriptors.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/ChangeLog.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/wortel.c.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: hurd-l4/wortel/ChangeLog
diff -u hurd-l4/wortel/ChangeLog:1.7 hurd-l4/wortel/ChangeLog:1.8
--- hurd-l4/wortel/ChangeLog:1.7        Mon Sep 29 12:03:54 2003
+++ hurd-l4/wortel/ChangeLog    Thu Oct  2 06:39:36 2003
@@ -1,3 +1,8 @@
+2003-10-01  Johan Rydberg  <address@hidden>
+
+       * wortel.c (serve_bootstrap_requests): Only throw away page zero
+       if it list as conventinal in memory descriptors.
+
 2003-09-29  Marcus Brinkmann  <address@hidden>
 
        * loader.c (loader_elf_load): Fix wordsize check.  Submitted by
Index: hurd-l4/wortel/wortel.c
diff -u hurd-l4/wortel/wortel.c:1.18 hurd-l4/wortel/wortel.c:1.19
--- hurd-l4/wortel/wortel.c:1.18        Wed Sep 24 20:29:14 2003
+++ hurd-l4/wortel/wortel.c     Thu Oct  2 06:39:36 2003
@@ -411,9 +411,22 @@
   hurd_task_id_t server_task = (mod_idx < mods_count)
     ? l4_version (mods[mod_idx].main_thread) : 0;
 
-  /* Allocate a single page at address 0, because we don't want to
-     bother anybody with that silly page.  */
-  sigma0_get_fpage (l4_fpage (0, l4_min_page_size ()));
+  /* True if we need to remap the page at address 0.  */
+  int get_page_zero = 0;
+  int i;
+
+  /* If a conventinal page with address 0 exists in the memory
+     descriptors, allocate it because we don't want to bother anybody
+     with that silly page.  FIXME: We should eventually remap it to a
+     high address and provide it to physmem.  */
+  for (i = 0; i < loader_get_num_memory_desc (); i++)
+    {
+      l4_memory_desc_t memdesc = loader_get_memory_desc (i);
+      if (memdesc->low == 0)
+       get_page_zero = (memdesc->type == L4_MEMDESC_CONVENTIONAL);
+    }
+  if (get_page_zero)
+    sigma0_get_fpage (l4_fpage (0, l4_min_page_size ()));
 
   do
     {