From: Bharath Vedartham <linux.bhar@gmail.com>
To: arnd@arndb.de, sivanich@sgi.com, gregkh@linuxfoundation.org
Cc: ira.weiny@intel.com, jhubbard@nvidia.com, jglisse@redhat.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Bharath Vedartham <linux.bhar@gmail.com>
Subject: [PATCH 2/3] sgi-gru: Remove CONFIG_HUGETLB_PAGE ifdef
Date: Sun, 21 Jul 2019 21:28:04 +0530 [thread overview]
Message-ID: <1563724685-6540-3-git-send-email-linux.bhar@gmail.com> (raw)
In-Reply-To: <1563724685-6540-1-git-send-email-linux.bhar@gmail.com>
is_vm_hugetlb_page has checks for whether CONFIG_HUGETLB_PAGE is defined
or not. If CONFIG_HUGETLB_PAGE is not defined is_vm_hugetlb_page will
always return false. There is no need to have an uneccessary
CONFIG_HUGETLB_PAGE check in the code.
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Signed-off-by: Bharath Vedartham <linux.bhar@gmail.com>
---
drivers/misc/sgi-gru/grufault.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index 61b3447..75108d2 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -180,11 +180,8 @@ 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 (get_user_pages(vaddr, 1, write ? FOLL_WRITE : 0, &page, NULL) <= 0)
return -EFAULT;
*paddr = page_to_phys(page);
@@ -238,11 +235,9 @@ 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
+
return 0;
err:
--
2.7.4
next prev parent reply other threads:[~2019-07-21 15:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 15:58 [PATCH 0/3] sgi-gru: get_user_page changes Bharath Vedartham
2019-07-21 15:58 ` [PATCH 1/3] sgi-gru: Convert put_page() to get_user_page*() Bharath Vedartham
2019-07-22 2:25 ` John Hubbard
2019-07-22 17:47 ` Bharath Vedartham
2019-07-21 15:58 ` Bharath Vedartham [this message]
2019-07-22 2:34 ` [PATCH 2/3] sgi-gru: Remove CONFIG_HUGETLB_PAGE ifdef John Hubbard
2019-07-22 3:20 ` William Kucharski
2019-07-22 17:50 ` Bharath Vedartham
2019-07-22 22:53 ` William Kucharski
2019-07-21 15:58 ` [PATCH 3/3] sgi-gru: Use __get_user_pages_fast in atomic_pte_lookup Bharath Vedartham
2019-07-22 2:32 ` John Hubbard
2019-07-22 17:53 ` Bharath Vedartham
2019-07-22 23:06 ` John Hubbard
2019-07-22 4:49 ` [PATCH 0/3] sgi-gru: get_user_page changes Ira Weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563724685-6540-3-git-send-email-linux.bhar@gmail.com \
--to=linux.bhar@gmail.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=ira.weiny@intel.com \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=sivanich@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).