Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[powerpc.git] / include / linux / shm.h

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 80113a1..ad2e3af 100644 (file)
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -92,15 +92,21 @@ struct shmid_kernel /* private to the kernel */
 #define        SHM_DEST        01000   /* segment will be destroyed on last detach */
 #define SHM_LOCKED      02000   /* segment will not be swapped */
 #define SHM_HUGETLB     04000   /* segment will use huge TLB pages */
+#define SHM_NORESERVE   010000  /* don't check for reservations */
 
 #ifdef CONFIG_SYSVIPC
 long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
+extern int is_file_shm_hugepages(struct file *file);
 #else
 static inline long do_shmat(int shmid, char __user *shmaddr,
                                int shmflg, unsigned long *addr)
 {
        return -ENOSYS;
 }
+static inline int is_file_shm_hugepages(struct file *file)
+{
+       return 0;
+}
 #endif
 
 #endif /* __KERNEL__ */