[commits] r9421 - in /fsf/glibc-2_11-branch/ports: ChangeLog.alpha sysdeps/unix/sysv/linux/alpha/bits/mman.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Dec  7 00:05:27 2009
New Revision: 9421

Log:
Import glibc-ports-2.11 for 2009-12-07

Modified:
    fsf/glibc-2_11-branch/ports/ChangeLog.alpha
    fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h

Modified: fsf/glibc-2_11-branch/ports/ChangeLog.alpha
==============================================================================
--- fsf/glibc-2_11-branch/ports/ChangeLog.alpha (original)
+++ fsf/glibc-2_11-branch/ports/ChangeLog.alpha Mon Dec  7 00:05:27 2009
@@ -1,3 +1,9 @@
+2009-11-23  Matt Turner  <mattst88@xxxxxxxxx>
+
+	[BZ #10972]
+	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Add new MADV_*
+	constants from recent kernels.
+
 2009-11-10  Matt Turner  <mattst88@xxxxxxxxx>
 
 	[BZ #10609]

Modified: fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h
==============================================================================
--- fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h (original)
+++ fsf/glibc-2_11-branch/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h Mon Dec  7 00:05:27 2009
@@ -1,5 +1,6 @@
 /* Definitions for POSIX memory map interface.  Linux/Alpha version.
-   Copyright (C) 1997, 1998, 2000, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2003, 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
@@ -91,14 +92,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   6	/* 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    6  /* 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.  */