Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308853
b: refs/heads/master
c: 2099597
h: refs/heads/master
i:
  308851: 5fe8c88
v: v3
  • Loading branch information
Alex Shi authored and Linus Torvalds committed May 29, 2012
1 parent 3757248 commit 699b7f4
Show file tree
Hide file tree
Showing 3 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: e30d539b3fe76f5bb71e069dcbfa47a1c2e6da3b
refs/heads/master: 2099597401c7710c00b0d7c32b24a44a193836e1
2 changes: 2 additions & 0 deletions trunk/include/linux/huge_mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ extern pmd_t *page_check_address_pmd(struct page *page,
#define HPAGE_PMD_MASK HPAGE_MASK
#define HPAGE_PMD_SIZE HPAGE_SIZE

extern bool is_vma_temporary_stack(struct vm_area_struct *vma);

#define transparent_hugepage_enabled(__vma) \
((transparent_hugepage_flags & \
(1<<TRANSPARENT_HUGEPAGE_FLAG) || \
Expand Down
2 changes: 0 additions & 2 deletions trunk/include/linux/rmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ enum ttu_flags {
};
#define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)

bool is_vma_temporary_stack(struct vm_area_struct *vma);

int try_to_unmap(struct page *, enum ttu_flags flags);
int try_to_unmap_one(struct page *, struct vm_area_struct *,
unsigned long address, enum ttu_flags flags);
Expand Down

0 comments on commit 699b7f4

Please sign in to comment.