From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 2 Apr 2015 09:22:07 +0000 (+0200)
Subject: mm, hugetlb: define page_hstate for !HUGETLB_PAGE
X-Git-Tag: v3.12.40~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04240adfe44b8a38c21ca0972ef620254b931e25;p=thirdparty%2Fkernel%2Fstable.git

mm, hugetlb: define page_hstate for !HUGETLB_PAGE

This is a single hunk introduced later in the upstream commit
cb900f41215447433cbc456d1c4294e858a84d7c (mm, hugetlb: convert
hugetlbfs to use split pmd lock). We need page_hstate even for
!HUGETLB_PAGE case for the next patch (mm: thp: give transparent
hugepage code a separate copy_page).

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 7e8e0001f241f..2a943a396d20a 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -418,6 +418,7 @@ struct hstate {};
 #define hstate_sizelog(s) NULL
 #define hstate_vma(v) NULL
 #define hstate_inode(i) NULL
+#define page_hstate(page) NULL
 #define huge_page_size(h) PAGE_SIZE
 #define huge_page_mask(h) PAGE_MASK
 #define vma_kernel_pagesize(v) PAGE_SIZE