r3982 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2009-11-17 21:51:05 +0000 (Tue, 17 Nov 2009)
New Revision: 3982
Modified:
glibc-package/trunk/debian/patches/any/cvs-ksm.diff
Log:
Add KSM support to MIPS and ARM
Modified: glibc-package/trunk/debian/patches/any/cvs-ksm.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ksm.diff 2009-11-17 21:41:22 UTC (rev 3981)
+++ glibc-package/trunk/debian/patches/any/cvs-ksm.diff 2009-11-17 21:51:05 UTC (rev 3982)
@@ -10,6 +10,15 @@
* sysdeps/unix/sysv/linux/sh/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/mman.h: Likewise.
+2009-11-17 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #10972]
+ * sysdeps/unix/sysv/linux/mips/bits/mman.h: Add new MADV_*
+ constants from recent kernels.
+ [BZ #10972]
+ * sysdeps/unix/sysv/linux/arm/bits/mman.h: Add new MADV_*
+ constants from recent kernels.
+
--- a/sysdeps/unix/sysv/linux/i386/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h
@@ -1,5 +1,5 @@
@@ -273,3 +282,74 @@
#endif
/* The POSIX people had to invent similar names for the same things. */
+--- ports/a/sysdeps/unix/sysv/linux/arm/bits/mman.h
++++ ports/b/sysdeps/unix/sysv/linux/arm/bits/mman.h
+@@ -1,5 +1,6 @@
+ /* Definitions for POSIX memory map interface. Linux/ARM 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
+@@ -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. */
+--- ports/a/sysdeps/unix/sysv/linux/mips/bits/mman.h
++++ ports/b/sysdeps/unix/sysv/linux/mips/bits/mman.h
+@@ -1,5 +1,5 @@
+ /* Definitions for POSIX memory map interface. Linux/MIPS version.
+- Copyright (C) 1997, 2000, 2003, 2004, 2005, 2006
++ Copyright (C) 1997, 2000, 2003, 2004, 2005, 2006, 2009
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+@@ -86,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. */
Reply to: