[folded-merged] mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: include/linux/hugetlb.h: make hstate_is_gigantic() inline
has been removed from the -mm tree.  Its filename was
     mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level-fix.patch

This patch was dropped because it was folded into mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: include/linux/hugetlb.h: make hstate_is_gigantic() inline

Ignoring the argument of both alloc_huge_page_node() and
hstate_is_gigantic() causes a harmless warning:

mm/memory-failure.c: In function 'new_page':
mm/memory-failure.c:1493:18: error: unused variable 'hstate' [-Werror=unused-variable]

Turning one into an inline function makes the compiler see that the
variable is not meant to be unused.

Fixes: d81a077951f8 ("mm/madvise: enable (soft|hard) offline of HugeTLB pages at PGD level")
Fixes: 39b80148ffd7 ("mm/follow_page_mask: add support for hugepage directory entry")
Link: http://lkml.kernel.org/r/20170522124748.3911296-1-arnd@xxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/hugetlb.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff -puN include/linux/hugetlb.h~mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level-fix include/linux/hugetlb.h
--- a/include/linux/hugetlb.h~mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level-fix
+++ a/include/linux/hugetlb.h
@@ -522,7 +522,11 @@ struct hstate {};
 #define vma_mmu_pagesize(v) PAGE_SIZE
 #define huge_page_order(h) 0
 #define huge_page_shift(h) PAGE_SHIFT
-#define hstate_is_gigantic(h) 0
+static inline bool hstate_is_gigantic(struct hstate *h)
+{
+	return false;
+}
+
 static inline unsigned int pages_per_huge_page(struct hstate *h)
 {
 	return 1;
_

Patches currently in -mm which might be from arnd@xxxxxxxx are

mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux