From 317d0e66a01302c98367b8776d5e7936a80f8ffb Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Tue, 2 Feb 2010 16:50:15 -0500 Subject: [PATCH] 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. --- ChangeLog.hppa | 5 +++++ sysdeps/unix/sysv/linux/hppa/bits/mman.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog.hppa b/ChangeLog.hppa index 4ddd2c353c6..a74131e7e6c 100644 --- a/ChangeLog.hppa +++ b/ChangeLog.hppa @@ -1,3 +1,8 @@ +2010-02-02 Carlos O'Donell + + * sysdeps/unix/sysv/linux/hppa/bits/mman.h: Define + MADV_MERGEABLE and MADV_UNMERGEABLE. + 2010-02-02 Carlos O'Donell * sysdeps/hppa/nptl/tls.h (__set_cr27): Clobber diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h index f0653221752..780862a38d0 100644 --- 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. */ -- 2.47.2