Define MADV_MERGEABLE and MADV_UNMERGEABLE.

Add MADV_MERGEABLE and MADV_UNMERGEABLE to bits/mman.h,
matching HPPA values used in Linux kernel 2.6.32.

diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 4ddd2c3..a74131e 100644 (file)
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,5 +1,10 @@
 2010-02-02  Carlos O'Donell  <carlos@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/hppa/bits/mman.h: Define
+       MADV_MERGEABLE and MADV_UNMERGEABLE.
+
+2010-02-02  Carlos O'Donell  <carlos@codesourcery.com>
+
        * sysdeps/hppa/nptl/tls.h (__set_cr27): Clobber
        link register r31.
 

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index f065322..780862a 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -86,6 +86,8 @@
 # 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   65   /* KSM may merge identical pages */
+# define MADV_UNMERGEABLE 66   /* KSM may not merge identical pages */
 #endif
 
 /* The range 12-64 is reserved for page size specification. */