Update from Linux 3.4

diff --git a/ChangeLog b/ChangeLog
index c487caf64dd3f79588796a0d9115d1dd0f0bdbe5..4254c90c847d9114e4de33dd870c78c19fddea05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-05-23  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): New macros from Linux 3.4.
+       macro.
+       * sysdeps/unix/sysv/linux/s390/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): Likewise.
+       * sysdeps/unix/sysv/linux/sh/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): Likewise.
+       * sysdeps/unix/sysv/linux/i386/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/bits/mman.h
+       (MADV_DONTDUMP,MADV_DODUMP): Likewise.
+       * sysdeps/unix/sysv/linux/bits/in.h
+       (IP_MULTICAST_ALL,IP_UNICAST_IF): Likewise.
+
 2012-05-22  Roland McGrath  <roland@hack.frob.com>
 
        * sysdeps/unix/sysv/linux/dl-vdso.h (CHECK_HASH): Macro removed.

diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 672757e6647099920ece47e7af349e3f8e933d14..4686ae21726093e3e4438a5d50309825923e8a7f 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000,2004,2008,2010,2011 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -50,6 +50,8 @@
 # define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
 # define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
 # define MCAST_MSFILTER 48
+# define IP_MULTICAST_ALL 49
+# define IP_UNICAST_IF 50
 
 # define MCAST_EXCLUDE   0
 # define MCAST_INCLUDE   1

diff --git a/sysdeps/unix/sysv/linux/i386/bits/mman.h b/sysdeps/unix/sysv/linux/i386/bits/mman.h
index 9677053cf485943a677eb51879bb46e31a708047..2bc2ca9d3438262eff00d2210f7844558afdb4d4 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h
@@ -1,6 +1,5 @@
 /* Definitions for POSIX memory map interface.  Linux/i386 version.
-   Copyright (C) 1997,2000,2003,2005,2006,2009,2010,2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -97,6 +96,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
index c02492cfbf68657e29b4eacf6053949d910a6b22..e9cc5a83b29b218b97690ce006060a46cd4a1d44 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
@@ -98,6 +98,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/s390/bits/mman.h b/sysdeps/unix/sysv/linux/s390/bits/mman.h
index 094afbe56c4aa3ddf0548346bfc60952276ea122..6369e8a81177c974cfcb94b17ede5f0907a0e8dd 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h
@@ -97,6 +97,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/sh/bits/mman.h b/sysdeps/unix/sysv/linux/sh/bits/mman.h
index d7f2ed53acf9a80e7bb5cacaae851e2d49e5a0ef..c535b7c3023bca424908bf55de10156e0d10b9ba 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h
@@ -96,6 +96,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
index fb9c75fe2a89b2782b986f7f423c64a0ddf6e5b8..6d4dd7ee5b201ab6d80d46fe802e51840c666b42 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
@@ -99,6 +99,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
index 7ec22479815f4f36206e2eb601394484ee08e26c..28b91603cfe7dd53f8f7f632d6561d213d9fb952 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
@@ -1,6 +1,5 @@
 /* Definitions for POSIX memory map interface.  Linux/x86_64 version.
-   Copyright (C) 2001,2003,2005,2006,2009,2010,2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 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
@@ -98,6 +97,9 @@
 # define MADV_UNMERGEABLE 13   /* KSM may not merge identical pages.  */
 # define MADV_HUGEPAGE   14    /* Worth backing with hugepages.  */
 # define MADV_NOHUGEPAGE  15   /* Not worth backing with hugepages.  */
+# define MADV_DONTDUMP   16    /* Explicity exclude from the core dump,
+                                   overrides the coredump filter bits.  */
+# define MADV_DODUMP     17    /* Clear the MADV_DONTDUMP flag.  */
 # define MADV_HWPOISON   100   /* Poison a page for testing.  */
 #endif