diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2010-02-02 16:50:15 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2010-02-17 09:27:42 -0500 |
| commit | 317d0e66a01302c98367b8776d5e7936a80f8ffb (patch) | |
| tree | 35f6655b8660d0f4b53f3fbe4b4f250138751a4a | |
| parent | d143075adc1b95a2760fa9d81c9de39b0b803091 (diff) | |
| download | glibc-317d0e66a01302c98367b8776d5e7936a80f8ffb.tar.xz glibc-317d0e66a01302c98367b8776d5e7936a80f8ffb.zip | |
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.
| -rw-r--r-- | ChangeLog.hppa | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/bits/mman.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.hppa b/ChangeLog.hppa index 4ddd2c353c..a74131e7e6 100644 --- 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 f065322175..780862a38d 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. */ |