r3981 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-11-17 21:41:22 +0000 (Tue, 17 Nov 2009)
New Revision: 3981
Added:
glibc-package/trunk/debian/patches/any/cvs-ksm.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-ksm.diff: add support to KSM, define MADV_MERGEABLE and
MADV_UNMERGEABLE. Closes: #556631.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-17 08:33:14 UTC (rev 3980)
+++ glibc-package/trunk/debian/changelog 2009-11-17 21:41:22 UTC (rev 3981)
@@ -7,8 +7,10 @@
patches/ia64/submitted-memchr.diff.
* patches/any/cvs-malloc-check.diff: new patch from upstream to fix bugs
with MALLOC_CHECK.
+ * patches/any/cvs-ksm.diff: add support to KSM, define MADV_MERGEABLE and
+ MADV_UNMERGEABLE. Closes: #556631.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 17 Nov 2009 09:33:01 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 17 Nov 2009 22:39:56 +0100
eglibc (2.10.1-7) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-ksm.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ksm.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-ksm.diff 2009-11-17 21:41:22 UTC (rev 3981)
@@ -0,0 +1,275 @@
+2009-11-17 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10972]
+ * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Add new MADV_*
+ constants from recent kernels.
+ * sysdeps/unix/sysv/linux/i386/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/sh/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/bits/mman.h: Likewise.
+
+--- a/sysdeps/unix/sysv/linux/i386/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h
+@@ -1,5 +1,5 @@
+ /* Definitions for POSIX memory map interface. Linux/i386 version.
+- Copyright (C) 1997, 2000, 2003, 2005, 2006 Free Software Foundation, Inc.
++ Copyright (C) 1997,2000,2003,2005,2006,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
+@@ -84,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. */
+diff --git a/sysdeps/unix/sysv/linux/ia64/bits/mman.h b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
+index a27a30f..1b278c7 100644
+--- a/sysdeps/unix/sysv/linux/ia64/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
+@@ -1,5 +1,6 @@
+ /* Definitions for POSIX memory map interface. Linux/ia64 version.
+- Copyright (C) 1997,1998,2000,2003,2005,2006 Free Software Foundation, Inc.
++ Copyright (C) 1997,1998,2000,2003,2005,2006,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
+@@ -84,14 +85,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. */
+diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+index d5729a1..e6580f8 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+@@ -1,5 +1,6 @@
+ /* Definitions for POSIX memory map interface. Linux/PowerPC version.
+- Copyright (C) 1997,2000,2003,2005,2006,2008 Free Software Foundation, Inc.
++ Copyright (C) 1997,2000,2003,2005,2006,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
+@@ -85,14 +86,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. */
+diff --git a/sysdeps/unix/sysv/linux/s390/bits/mman.h b/sysdeps/unix/sysv/linux/s390/bits/mman.h
+index d25531c..daeafd4 100644
+--- a/sysdeps/unix/sysv/linux/s390/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h
+@@ -1,5 +1,5 @@
+ /* Definitions for POSIX memory map interface. Linux/s390 version.
+- Copyright (C) 2000,2001,2002,2003,2005,2006 Free Software Foundation, Inc.
++ Copyright (C) 2000-2003,2005,2006,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
+@@ -84,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. */
+diff --git a/sysdeps/unix/sysv/linux/sh/bits/mman.h b/sysdeps/unix/sysv/linux/sh/bits/mman.h
+index 7a6b572..aee0011 100644
+--- a/sysdeps/unix/sysv/linux/sh/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h
+@@ -1,5 +1,6 @@
+ /* Definitions for POSIX memory map interface. Linux/SH version.
+- Copyright (C) 1997,1999,2000,2003,2005,2006 Free Software Foundation, Inc.
++ Copyright (C) 1997,1999,2000,2003,2005,2006,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. */
+diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
+index be2b7eb..71a3aa6 100644
+--- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
+@@ -1,5 +1,6 @@
+ /* Definitions for POSIX memory map interface. Linux/SPARC version.
+- Copyright (C) 1997,1999,2000,2003,2005,2006 Free Software Foundation, Inc.
++ Copyright (C) 1997,1999,2000,2003,2005,2006,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
+@@ -85,15 +86,18 @@
+
+ /* 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_FREE 5 /* Content can be freed (Solaris). */
+-# 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_FREE 5 /* Content can be freed (Solaris). */
++# 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. */
+diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
+index 7810682..3dcbf9c 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
++++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
+@@ -1,5 +1,5 @@
+ /* Definitions for POSIX memory map interface. Linux/x86_64 version.
+- Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
++ Copyright (C) 2001, 2003, 2005, 2006, 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
+@@ -85,14 +85,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. */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-17 08:33:14 UTC (rev 3980)
+++ glibc-package/trunk/debian/patches/series 2009-11-17 21:41:22 UTC (rev 3981)
@@ -216,3 +216,4 @@
any/submitted-sched_h.2.diff
all/local-ldd.diff
any/cvs-malloc-check.diff
+any/cvs-ksm.diff
Reply to: