Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp6087759ybi; Sun, 21 Jul 2019 09:00:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxX+NAi/q7BfEvsjuItaVW3+tB8LXUympvTfSZLmI3vobtx2Sk0Qg1MNWPf8MvabNOpAzcT X-Received: by 2002:a63:1:: with SMTP id 1mr2803100pga.162.1563724832259; Sun, 21 Jul 2019 09:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563724832; cv=none; d=google.com; s=arc-20160816; b=iTGK/ksrkXnPA+cOBTbOml55F88sM04M/LAuKCp0SXuAG3952H13OH7loDNE4mlfVB oSSI8ucJB789iVqsKnqWEzQOgyvu5Nh6brtG2YSGaEhY0tUo2YBMcRfFk5pl2FBmlzgY zy0c8FuB8B1T8aXyTGAnhtDM3QxEgkBm0zQODEkal2c+QF2wfc+drXUkKx+fuU3v8/Wi SFLPbH/wU0eNSt6P3++9I19U91xE14H/Qf2sV1mGoh7GkLcAV/me85eburMfIZzTOJPF /im6sy9foDAGwvXOmiWSdx+wVgj7U6ikYOfyKtclVYrmh9ntiErfX+BJ4eaJJAN1nNkr lfww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YPxj1xULAmyThBZtHUXs4RUTpVotq1m6ArGML4hnd9o=; b=L4ITxzJV+CddYvLvCN7IpkrtsxARjSmJRvIZIfs6VROAcMsvBMhBx22KCYxQWj1TU8 Sh0pJs5mN1VC9jbmpYiP7V93NJWPMAf9fa23oW+UbMuIlrycBRyblgSMb+oF1agH9Cnz n2IuJopoVBBufS3MPwWCFqivUV9mIEKkKwbUi/XT57lYClIUttu8as/25fM5SEoJF8lA JYZ7g260MQ1n2ejjtnnkpUET6dJu/9pwl8tjYYn5pyH1kbFH6i49WkeFeu3p7Cr2R58I Jd0vB/lws7ctU/2Sku8oV3219kF1rJGVVd/fCDL9DMvBCVkGP7m3tubjWXRHSxrpUKfk CkTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ifiOqyLu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v8si6503949plg.122.2019.07.21.09.00.16; Sun, 21 Jul 2019 09:00:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ifiOqyLu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726795AbfGUP61 (ORCPT + 99 others); Sun, 21 Jul 2019 11:58:27 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42703 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726441AbfGUP60 (ORCPT ); Sun, 21 Jul 2019 11:58:26 -0400 Received: by mail-pf1-f193.google.com with SMTP id q10so16168612pff.9 for ; Sun, 21 Jul 2019 08:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YPxj1xULAmyThBZtHUXs4RUTpVotq1m6ArGML4hnd9o=; b=ifiOqyLuR2fVpSX7LgALyQR4fLm8I1fH/HPzFhDKareH7Mat4AeFK7FriOec5kkIK2 wrkY60M1g9T4xGKZPATWmMcmqyzUnhouyS8jLdWqlmaw7Uhyw/yfS0tLX1lp5rQKJaLB fSm4JJfRR3RL77klHIt1fyvoW6veo0UFmmjnBE0gck+i8fxq2rd44U40PHlylpJTqIFg +L6uKhgtV6nQN6+xT9aOPjVaCGAp/jC3uuTmzJ4x6M5L8PFe1TRJ2Dg9yYZ8tyYsO4mz WffynzmJeO020XEI+EyeM/h1PfhhEpTI0MK5P2rjMCAKJbRMywzH8bFyVmkubOP7fvDa Bwyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YPxj1xULAmyThBZtHUXs4RUTpVotq1m6ArGML4hnd9o=; b=sRtbXbj107BF4n+E/gqeFXUbg05KzunvbKVlzei0STkOYlQ7M1S08IY8c+R5djTNbH sSPT3ECe2n+plmoBvm2b0LMbRf4rMOZDvaZCuMpFhiFQG0/2xmQPYtgimcRDtYSVHWOb ta4eFKv+C0tfO1PJiQGYAzNk66IikqxZ4ortX1/vnikbUgMNwM/qt06qsXscTJk6FvGh eRRCHxfyqDltz4ye9hhYuVW/0yQPzgY1cqye2sl4uML1WRhAhA/oJHG6Ux3Qy/8kQuXG fLj/qev2xQu+Ng654KTwv0KG5BU0RS3jKLIaxNTlw+LndoTMiarveMfc80fF2VfzzAlw n/qQ== X-Gm-Message-State: APjAAAU3Ltdfyf9iv/Sq7Xo2HD0a+8Ivc3chrJS9oaPiPSDhMRv8SjKQ v7rjVFCQj7WL5/yFdQcv80E= X-Received: by 2002:a63:b1d:: with SMTP id 29mr67183457pgl.103.1563724705973; Sun, 21 Jul 2019 08:58:25 -0700 (PDT) Received: from bharath12345-Inspiron-5559 ([103.110.42.34]) by smtp.gmail.com with ESMTPSA id e17sm27335437pgm.21.2019.07.21.08.58.24 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Jul 2019 08:58:25 -0700 (PDT) From: Bharath Vedartham 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 Subject: [PATCH 2/3] sgi-gru: Remove CONFIG_HUGETLB_PAGE ifdef Date: Sun, 21 Jul 2019 21:28:04 +0530 Message-Id: <1563724685-6540-3-git-send-email-linux.bhar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563724685-6540-1-git-send-email-linux.bhar@gmail.com> References: <1563724685-6540-1-git-send-email-linux.bhar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: John Hubbard Cc: Jérôme Glisse Cc: Greg Kroah-Hartman Cc: Dimitri Sivanich Cc: Arnd Bergmann Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Bharath Vedartham --- 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