From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Punit Agrawal <punit.agrawal@arm.com>,
Anshuman Khandual <khandual@linux.vnet.ibm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mm: hugetlb: replace some macros with inline functions
Date: Sun, 11 Jun 2017 23:50:09 +0000 [thread overview]
Message-ID: <20170611235009.GA4959@hori1.linux.bs1.fc.nec.co.jp> (raw)
In-Reply-To: <20170609102544.2947326-1-arnd@arndb.de>
On Fri, Jun 09, 2017 at 12:25:05PM +0200, Arnd Bergmann wrote:
> All users of dissolve_free_huge_page() that ignore the result cause a warning
> when CONFIG_HUGETLB_PAGE is disabled:
>
> mm/memory-failure.c: In function 'me_huge_page':
> include/linux/hugetlb.h:556:36: error: statement with no effect [-Werror=unused-value]
> #define dissolve_free_huge_page(p) 0
>
> We can avoid this by using an inline function instead of the macro, and I
> decided to do the same change for the related helpers as well.
>
> Fixes: mmotm ("mm: hugetlb: soft-offline: dissolve source hugepage after successful migration")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Right, thank you for catching this.
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
> ---
> include/linux/hugetlb.h | 31 ++++++++++++++++++++++++++-----
> 1 file changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index dbb118c566cd..57f700ac127e 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -546,16 +546,37 @@ static inline unsigned int pages_per_huge_page(struct hstate *h)
> {
> return 1;
> }
> -#define hstate_index_to_shift(index) 0
> -#define hstate_index(h) 0
> +
> +static inline unsigned hstate_index_to_shift(unsigned index)
> +{
> + return 0;
> +}
> +
> +static inline int hstate_index(struct hstate *h)
> +{
> + return 0;
> +}
>
> static inline pgoff_t basepage_index(struct page *page)
> {
> return page->index;
> }
> -#define dissolve_free_huge_page(p) 0
> -#define dissolve_free_huge_pages(s, e) 0
> -#define hugepage_migration_supported(h) false
> +
> +static inline int dissolve_free_huge_page(struct page *page)
> +{
> + return 0;
> +}
> +
> +static inline int dissolve_free_huge_pages(unsigned long start_pfn,
> + unsigned long end_pfn)
> +{
> + return 0;
> +}
> +
> +static inline bool hugepage_migration_supported(struct hstate *h)
> +{
> + return false;
> +}
>
> static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
> struct mm_struct *mm, pte_t *pte)
> --
> 2.9.0
>
>
prev parent reply other threads:[~2017-06-11 23:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 10:25 [PATCH] mm: hugetlb: replace some macros with inline functions Arnd Bergmann
2017-06-11 23:50 ` Naoya Horiguchi [this message]
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=20170611235009.GA4959@hori1.linux.bs1.fc.nec.co.jp \
--to=n-horiguchi@ah.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=arnd@arndb.de \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=punit.agrawal@arm.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).