[Linux-kernel-mentees] [PATCH 2/2] sgi-gru: Remove uneccessary ifdef for CONFIG_HUGETLB_PAGE
Bharath Vedartham
linux.bhar at gmail.com
Sun Aug 18 19:38:55 UTC 2019
is_vm_hugetlb_page will always return false if CONFIG_HUGETLB_PAGE is
not set.
Cc: Ira Weiny <ira.weiny at intel.com>
Cc: John Hubbard <jhubbard at nvidia.com>
Cc: Jérôme Glisse <jglisse at redhat.com>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Dimitri Sivanich <sivanich at sgi.com>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: William Kucharski <william.kucharski at oracle.com>
Cc: Christoph Hellwig <hch at lst.de>
Cc: linux-kernel at vger.kernel.org
Cc: linux-mm at kvack.org
Cc: linux-kernel-mentees at lists.linuxfoundation.org
Reviewed-by: Ira Weiny <ira.weiny at intel.com>
Reviewed-by: John Hubbard <jhubbard at nvidia.com>
Reviewed-by: William Kucharski <william.kucharski at oracle.com>
Signed-off-by: Bharath Vedartham <linux.bhar at gmail.com>
---
drivers/misc/sgi-gru/grufault.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index 61b3447..bce47af 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -180,11 +180,11 @@ static int non_atomic_pte_lookup(struct vm_area_struct *vma,
{
struct page *page;
-#ifdef CONFIG_HUGETLB_PAGE
- *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
-#else
- *pageshift = PAGE_SHIFT;
-#endif
+ if (unlikely(is_vm_hugetlb_page(vma)))
+ *pageshift = HPAGE_SHIFT;
+ else
+ *pageshift = PAGE_SHIFT;
+
if (get_user_pages(vaddr, 1, write ? FOLL_WRITE : 0, &page, NULL) <= 0)
return -EFAULT;
*paddr = page_to_phys(page);
@@ -238,11 +238,12 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
return 1;
*paddr = pte_pfn(pte) << PAGE_SHIFT;
-#ifdef CONFIG_HUGETLB_PAGE
- *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
-#else
- *pageshift = PAGE_SHIFT;
-#endif
+
+ if (unlikely(is_vm_hugetlb_page(vma)))
+ *pageshift = HPAGE_SHIFT;
+ else
+ *pageshift = PAGE_SHIFT;
+
return 0;
err:
--
2.7.4
More information about the Linux-kernel-mentees
mailing list