[commits] r12596 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/m68k/bits/ sysdeps/unix/sysv/linux/m68k/nptl/bits/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan 19 00:03:52 2011
New Revision: 12596

Log:
Import glibc-ports-mainline for 2011-01-19

Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Wed Jan 19 00:03:52 2011
@@ -1,3 +1,8 @@
+2011-01-18  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/bits/mman.h (MADV_HUGEPAGE)
+	(MADV_NOHUGEPAGE): Define.
+
 2011-01-10  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (sem_t):

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h Wed Jan 19 00:03:52 2011
@@ -1,5 +1,5 @@
 /* Definitions for POSIX memory map interface.  Linux/m68k version.
-   Copyright (C) 1997, 2000, 2003, 2005, 2008, 2009
+   Copyright (C) 1997, 2000, 2003, 2005, 2008, 2009, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -94,6 +94,8 @@
 # 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_HUGEPAGE	  14	/* Worth backing with hugepages.  */
+# define MADV_NOHUGEPAGE  15	/* Not worth backing with hugepages.  */
 # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
 #endif
 

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h Wed Jan 19 00:03:52 2011
@@ -32,5 +32,5 @@
 typedef union
 {
   char __size[__SIZEOF_SEM_T];
-  long int __align __attribute__ ((aligned (4)));
+  long int __align __attribute__ ((__aligned__ (4)));
 } sem_t;