Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250934
b: refs/heads/master
c: 13057ef
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Wilson authored and Linus Torvalds committed May 25, 2011
1 parent 44282d7 commit 9f90cc9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 9840e37239183a947a15d617c67e418c6e505dd8
refs/heads/master: 13057efb0a0063eb8042d99093ec88a52c4f1593
4 changes: 2 additions & 2 deletions trunk/include/linux/mempolicy.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ int do_migrate_pages(struct mm_struct *mm,

#ifdef CONFIG_TMPFS
extern int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context);
#endif

extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
int no_context);
#endif

/* Check if a vma is migratable */
static inline int vma_migratable(struct vm_area_struct *vma)
Expand Down Expand Up @@ -371,13 +371,13 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol,
{
return 1; /* error */
}
#endif

static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
int no_context)
{
return 0;
}
#endif

#endif /* CONFIG_NUMA */
#endif /* __KERNEL__ */
Expand Down

0 comments on commit 9f90cc9

Please sign in to comment.