Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166178
b: refs/heads/master
c: e9ea0e2
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Sep 25, 2009
1 parent bae2fdc commit eeea1d2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c44972f1782124f945ec8bea8a78f30f1a3538bd
refs/heads/master: e9ea0e2d1d00959b451dfc239df126d3c6a22043
12 changes: 8 additions & 4 deletions trunk/include/linux/hugetlb.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

#include <linux/fs.h>

struct ctl_table;
struct user_struct;

#ifdef CONFIG_HUGETLB_PAGE

#include <linux/mempolicy.h>
#include <linux/shm.h>
#include <asm/tlbflush.h>

struct ctl_table;
struct user_struct;

int PageHuge(struct page *page);

static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)
Expand Down Expand Up @@ -187,7 +187,11 @@ static inline void set_file_hugepages(struct file *file)

#define is_file_hugepages(file) 0
#define set_file_hugepages(file) BUG()
#define hugetlb_file_setup(name,size,acct,user,creat) ERR_PTR(-ENOSYS)
static inline struct file *hugetlb_file_setup(const char *name, size_t size,
int acctflag, struct user_struct **user, int creat_flags)
{
return ERR_PTR(-ENOSYS);
}

#endif /* !CONFIG_HUGETLBFS */

Expand Down

0 comments on commit eeea1d2

Please sign in to comment.