commit 4c8caf0ad39768e614fb4c1f5ef415aab223adb2
author Elliott Hughes <enh@google.com> Wed Jan 08 02:41:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 02:41:04 2014 +0000
tree 2098c40f20f777879316136d5dbcfaed1a47113b
parent 4faf76ca114a11cd264b0f5907e517add4585b27
parent bbb34f9536db8234b0b43bd5333256fa4accc50e

Merge "<sched.h> should offer both __sched_priority and sched_priority."

libc/include/fcntl.h

diff --git a/libc/include/fcntl.h b/libc/include/fcntl.h
index ffbbd47..f6a89ef 100644
--- a/libc/include/fcntl.h
+++ b/libc/include/fcntl.h
@@ -31,6 +31,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <linux/fadvise.h>
 #include <linux/fcntl.h>
 #include <unistd.h>  /* this is not required, but makes client code much happier */
 

libc/include/sys/swap.h

diff --git a/libc/include/sys/swap.h b/libc/include/sys/swap.h
index 97a6f36..e4c1819 100644
--- a/libc/include/sys/swap.h
+++ b/libc/include/sys/swap.h
@@ -33,6 +33,11 @@
 
 __BEGIN_DECLS
 
+#define SWAP_FLAG_DISCARD 0x10000
+#define SWAP_FLAG_PREFER 0x8000
+#define SWAP_FLAG_PRIO_MASK 0x7fff
+#define SWAP_FLAG_PRIO_SHIFT 0
+
 extern int swapon(const char*, int) __nonnull((1));
 extern int swapoff(const char*) __nonnull((1));
 

libc/include/sys/vfs.h

diff --git a/libc/include/sys/vfs.h b/libc/include/sys/vfs.h
index 79995bb..10fe502 100644
--- a/libc/include/sys/vfs.h
+++ b/libc/include/sys/vfs.h
@@ -36,6 +36,7 @@
 
 /* The kernel's __kernel_fsid_t has a 'val' member but glibc uses '__val'. */
 typedef struct { int __val[2]; } __fsid_t;
+typedef __fsid_t fsid_t;
 
 #if defined(__LP64__)
 struct statfs {
@@ -46,7 +47,7 @@
   uint64_t f_bavail;
   uint64_t f_files;
   uint64_t f_ffree;
-  __fsid_t f_fsid;
+  fsid_t f_fsid;
   uint64_t f_namelen;
   uint64_t f_frsize;
   uint64_t f_flags;
@@ -64,7 +65,7 @@
   uint64_t f_files;
   uint64_t f_ffree;
   uint64_t f_bavail;
-  __fsid_t f_fsid;
+  fsid_t f_fsid;
   uint32_t f_namelen;
   uint32_t f_flags;
   uint32_t f_spare[5];
@@ -79,7 +80,7 @@
   uint64_t f_bavail;
   uint64_t f_files;
   uint64_t f_ffree;
-  __fsid_t f_fsid;
+  fsid_t f_fsid;
   uint32_t f_namelen;
   uint32_t f_frsize;
   uint32_t f_flags;