Merge commit 'sv/master'

7 files changed, 24 insertions, 10 deletions

diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog
index dc6fecc..fc3be46 100644
--- a/libhurd-mm/ChangeLog
+++ b/libhurd-mm/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-04  Neal H. Walfield  <neal@gnu.org>
+
+	* madvise.c (madvise): Use the correct format modifiers.  Print
+	the correct values.
+
 2008-11-18  Neal H. Walfield  <neal@gnu.org>
 
 	* as-dump.c (do_walk): Don't print the prefix if it is the empty
diff --git a/libhurd-mm/madvise.c b/libhurd-mm/madvise.c
index b9494cd..529c2be 100644
--- a/libhurd-mm/madvise.c
+++ b/libhurd-mm/madvise.c
@@ -35,12 +35,12 @@ madvise (void *addr, size_t length, int advice)
 
   if (((uintptr_t) addr & (PAGESIZE - 1)) != 0)
     {
-      debug (0, "Address %x not multiple of pagesize.", addr);
+      debug (0, "Address %p not multiple of pagesize.", addr);
       return EINVAL;
     }
   if ((length & (PAGESIZE - 1)) != 0)
     {
-      debug (0, "Length %x not multiple of pagesize.", addr);
+      debug (0, "Length %x not multiple of pagesize.", length);
       return EINVAL;
     }
 
diff --git a/libhurd-slab/ChangeLog b/libhurd-slab/ChangeLog
index b7e4c9a..18ac0d0 100644
--- a/libhurd-slab/ChangeLog
+++ b/libhurd-slab/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-04  Neal H. Walfield  <neal@gnu.org>
+
+	* Makefile.am (AM_CPPFLAGS): Set to $(USER_CPPFLAGS).
+	(AM_CFLAGS): Set to $(USER_CFLAGS).
+
 2008-11-03  Neal H. Walfield  <neal@gnu.org>
 
 	* headers.m4: Don't create an empty libhurd-slab/libhurd-slab.a.
diff --git a/libhurd-slab/Makefile.am b/libhurd-slab/Makefile.am
index 3450879..3ec8438 100644
--- a/libhurd-slab/Makefile.am
+++ b/libhurd-slab/Makefile.am
@@ -26,8 +26,6 @@ endif
 includehurddir = $(includedir)/hurd
 includehurd_HEADERS = slab.h
 
-# FIXME: Build a special libhurd-ihash.a using libc-parts for the rootservers,
-# and a normal for everybody else.
-AM_CPPFLAGS = -I$(LIBC)/include -I$(top_builddir)/include	\
-	-I$(top_srcdir)/libc-parts
+AM_CPPFLAGS = $(USER_CPPFLAGS)
+AM_CFLAGS = $(USER_CFLAGS)
 libhurd_slab_a_SOURCES = slab.h slab.c
diff --git a/libl4/ChangeLog b/libl4/ChangeLog
index d75d52b..be01e5a 100644
--- a/libl4/ChangeLog
+++ b/libl4/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-04  Neal H. Walfield  <neal@gnu.org>
+
+	* l4/space.h: Don't include <assert.h>.
+	(_L4_fpage): Remove asserts.
+
+2008-12-04  Neal H. Walfield  <neal@gnu.org>
+
+	* l4/misc.h: Include <l4/space.h>.
+
 2008-11-17  Neal H. Walfield  <neal@gnu.org>
 
 	* ia32/l4/bits/syscall.h: New function.
diff --git a/libl4/l4/misc.h b/libl4/l4/misc.h
index 77fb21c..2d7d206 100644
--- a/libl4/l4/misc.h
+++ b/libl4/l4/misc.h
@@ -23,6 +23,7 @@
 #define _L4_MISC_H	1
 
 #include <l4/types.h>
+#include <l4/space.h>
 #include <l4/bits/misc.h>
 #include <l4/vregs.h>
 #include <l4/syscall.h>
diff --git a/libl4/l4/space.h b/libl4/l4/space.h
index 53d2193..f4038cd 100644
--- a/libl4/l4/space.h
+++ b/libl4/l4/space.h
@@ -26,7 +26,6 @@
 #include <l4/math.h>
 #include <l4/bits/space.h>
 #include <l4/syscall.h>
-#include <assert.h>
 
 
 typedef _L4_RAW
@@ -84,9 +83,6 @@ _L4_fpage (_L4_word_t base, int size)
   _L4_word_t msb = _L4_msb (size) - 1;
   _L4_word_t lsb = _L4_lsb (size) - 1;
 
-  assert ((base & ((1 << 10) - 1)) == 0);
-  assert (msb == lsb);
-
   fpage.base = base >> 10;
   fpage.log2_size = size ? ((1 << msb) == size ? msb : msb + 1) : 0;
   fpage.rights = _L4_no_access;