diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:27:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:27:23 +0100 |
| commit | b00560f2d4de69bb12f66f9605985b516df98d77 (patch) | |
| tree | 0c92fc994125dc3ddb635842715be29d8b16808b /include/linux/huge_mm.h | |
| parent | bf1af3a809506645b9130755b713b008da14737f (diff) | |
| parent | 4fe757dd48a9e95e1a071291f15dda5421dacb66 (diff) | |
| download | lwn-b00560f2d4de69bb12f66f9605985b516df98d77.tar.gz lwn-b00560f2d4de69bb12f66f9605985b516df98d77.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we need to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/huge_mm.h')
| -rw-r--r-- | include/linux/huge_mm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 8e6c8c42bc3c..df29c8fde36b 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -57,7 +57,8 @@ extern pmd_t *page_check_address_pmd(struct page *page, (transparent_hugepage_flags & \ (1<<TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG) && \ ((__vma)->vm_flags & VM_HUGEPAGE))) && \ - !((__vma)->vm_flags & VM_NOHUGEPAGE)) + !((__vma)->vm_flags & VM_NOHUGEPAGE) && \ + !is_vma_temporary_stack(__vma)) #define transparent_hugepage_defrag(__vma) \ ((transparent_hugepage_flags & \ (1<<TRANSPARENT_HUGEPAGE_DEFRAG_FLAG)) || \ |