projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable socket power in adapter driver instead of media one
[powerpc.git]
/
include
/
linux
/
hugetlb.h
diff --git
a/include/linux/hugetlb.h
b/include/linux/hugetlb.h
index
a60995a
..
b4570b6
100644
(file)
--- a/
include/linux/hugetlb.h
+++ b/
include/linux/hugetlb.h
@@
-4,6
+4,7
@@
#ifdef CONFIG_HUGETLB_PAGE
#include <linux/mempolicy.h>
#ifdef CONFIG_HUGETLB_PAGE
#include <linux/mempolicy.h>
+#include <linux/shm.h>
#include <asm/tlbflush.h>
struct ctl_table;
#include <asm/tlbflush.h>
struct ctl_table;
@@
-168,7
+169,12
@@
void hugetlb_put_quota(struct address_space *mapping);
static inline int is_file_hugepages(struct file *file)
{
static inline int is_file_hugepages(struct file *file)
{
- return file->f_op == &hugetlbfs_file_operations;
+ if (file->f_op == &hugetlbfs_file_operations)
+ return 1;
+ if (is_file_shm_hugepages(file))
+ return 1;
+
+ return 0;
}
static inline void set_file_hugepages(struct file *file)
}
static inline void set_file_hugepages(struct file *file)
@@
-183,4
+189,10
@@
static inline void set_file_hugepages(struct file *file)
#endif /* !CONFIG_HUGETLBFS */
#endif /* !CONFIG_HUGETLBFS */
+#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
+unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ unsigned long len, unsigned long pgoff,
+ unsigned long flags);
+#endif /* HAVE_ARCH_HUGETLB_UNMAPPED_AREA */
+
#endif /* _LINUX_HUGETLB_H */
#endif /* _LINUX_HUGETLB_H */