[commits] r12058 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/sys/swap.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Nov 17 00:03:27 2010
New Revision: 12058

Log:
Import glibc-mainline for 2010-11-17

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/swap.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov 17 00:03:27 2010
@@ -1,3 +1,7 @@
+2010-11-16  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
+
 2010-11-11  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/swap.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/swap.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/swap.h Wed Nov 17 00:03:27 2010
@@ -1,5 +1,5 @@
 /* Calls to enable and disable swapping on specified locations.  Linux version.
-   Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 1999, 2010 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
@@ -28,6 +28,7 @@
 #define	SWAP_FLAG_PREFER	0x8000	/* Set if swap priority is specified. */
 #define	SWAP_FLAG_PRIO_MASK	0x7fff
 #define	SWAP_FLAG_PRIO_SHIFT	0
+#define SWAP_FLAG_DISCARD	0x10000	/* Discard swap cluster after use.  */
 
 __BEGIN_DECLS