Add new MADV_* values for M68K.

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 4dc4f41..7a3e8b7 100644 (file)
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,9 @@
+2009-11-17  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #10972]
+       * sysdeps/unix/sysv/linux/m68k/bits/mman.h: Add new MADV_*
+       constants from recent kernels.
+
 2009-11-15  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/m68k/libgcc_s.h: New file.

diff --git a/sysdeps/unix/sysv/linux/m68k/bits/mman.h b/sysdeps/unix/sysv/linux/m68k/bits/mman.h
index ab99176..15727ad 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/mman.h
@@ -1,5 +1,6 @@
 /* Definitions for POSIX memory map interface.  Linux/m68k version.
-   Copyright (C) 1997, 2000, 2003, 2005, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2003, 2005, 2008, 2009
+   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
@@ -83,14 +84,17 @@
 
 /* Advice to `madvise'.  */
 #ifdef __USE_BSD
-# define MADV_NORMAL    0      /* No further special treatment.  */
-# define MADV_RANDOM    1      /* Expect random page references.  */
-# define MADV_SEQUENTIAL 2     /* Expect sequential page references.  */
-# define MADV_WILLNEED  3      /* Will need these pages.  */
-# define MADV_DONTNEED  4      /* Don't need these pages.  */
-# define MADV_REMOVE    9      /* Remove these pages and resources.  */
-# define MADV_DONTFORK  10     /* Do not inherit across fork.  */
-# define MADV_DOFORK    11     /* Do inherit across fork.  */
+# define MADV_NORMAL     0     /* No further special treatment.  */
+# define MADV_RANDOM     1     /* Expect random page references.  */
+# define MADV_SEQUENTIAL  2    /* Expect sequential page references.  */
+# define MADV_WILLNEED   3     /* Will need these pages.  */
+# define MADV_DONTNEED   4     /* Don't need these pages.  */
+# define MADV_REMOVE     9     /* Remove these pages and resources.  */
+# define MADV_DONTFORK   10    /* Do not inherit across fork.  */
+# define MADV_DOFORK     11    /* Do inherit across fork.  */
+# define MADV_MERGEABLE          12    /* KSM may merge identical pages.  */
+# define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
+# define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 
 /* The POSIX people had to invent similar names for the same things.  */