Hurd: #define away madvise for malloc code.

diff --git a/ChangeLog b/ChangeLog
index 131caa6..2aba4a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
 
 2012-02-15  Roland McGrath  <roland@hack.frob.com>
 
+       [BZ #4822]
+       * sysdeps/mach/hurd/malloc-machine.h (madvise): New macro.
+
        * mach/devstream.c (cookie_io_functions_t): Macro removed.
        (write, read, close): Likewise.
        Patch by Aurelien Jarno <aurelien@aurel32.net>.

diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h
index 6907327..56ae26d 100644 (file)
--- a/sysdeps/mach/hurd/malloc-machine.h
+++ b/sysdeps/mach/hurd/malloc-machine.h
@@ -1,6 +1,6 @@
 /* Basic platform-independent macro definitions for mutexes,
    thread-specific data and parameters for malloc.
-   Copyright (C) 2003, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -62,6 +62,10 @@ __libc_tsd_define (static, void *, MALLOC)   /* declaration/common definition */
 #define tsd_setspecific(key, data)     __libc_tsd_set (void *, MALLOC, (data))
 #define tsd_getspecific(key, vptr)     ((vptr) = __libc_tsd_get (void *, MALLOC))
 
+/* madvise is a stub on Hurd, so don't bother calling it.  */
+#undef madvise
+#define madvise(addr, len, advice)     ((void) ((addr), (len), (advice)))
+
 #include <sysdeps/generic/malloc-machine.h>
 
 #endif /* !defined(_MALLOC_MACHINE_H) */