From: jglisse@redhat.com
To: linux-mm@kvack.org
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
"Jérôme Glisse" <jglisse@redhat.com>,
stable@vger.kernel.org, "Ralph Campbell" <rcampbell@nvidia.com>,
"John Hubbard" <jhubbard@nvidia.com>,
"Evgeny Baskakov" <ebaskakov@nvidia.com>
Subject: [PATCH 02/14] mm/hmm: fix header file if/else/endif maze
Date: Fri, 16 Mar 2018 15:14:07 -0400 [thread overview]
Message-ID: <20180316191414.3223-3-jglisse@redhat.com> (raw)
In-Reply-To: <20180316191414.3223-1-jglisse@redhat.com>
From: JA(C)rA'me Glisse <jglisse@redhat.com>
The #if/#else/#endif for IS_ENABLED(CONFIG_HMM) were wrong.
Signed-off-by: JA(C)rA'me Glisse <jglisse@redhat.com>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Cc: stable@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Evgeny Baskakov <ebaskakov@nvidia.com>
---
include/linux/hmm.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index 325017ad9311..ef6044d08cc5 100644
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -498,6 +498,9 @@ struct hmm_device {
struct hmm_device *hmm_device_new(void *drvdata);
void hmm_device_put(struct hmm_device *hmm_device);
#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */
+#else /* IS_ENABLED(CONFIG_HMM) */
+static inline void hmm_mm_destroy(struct mm_struct *mm) {}
+static inline void hmm_mm_init(struct mm_struct *mm) {}
#endif /* IS_ENABLED(CONFIG_HMM) */
/* Below are for HMM internal use only! Not to be used by device driver! */
@@ -513,8 +516,4 @@ static inline void hmm_mm_destroy(struct mm_struct *mm) {}
static inline void hmm_mm_init(struct mm_struct *mm) {}
#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */
-
-#else /* IS_ENABLED(CONFIG_HMM) */
-static inline void hmm_mm_destroy(struct mm_struct *mm) {}
-static inline void hmm_mm_init(struct mm_struct *mm) {}
#endif /* LINUX_HMM_H */
--
2.14.3
next prev parent reply other threads:[~2018-03-16 19:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 19:14 [PATCH 0/4] hmm: fixes and documentations v2 jglisse
2018-03-16 19:14 ` [PATCH 01/14] mm/hmm: documentation editorial update to HMM documentation jglisse
2018-03-16 19:14 ` jglisse [this message]
2018-03-16 21:09 ` [PATCH 02/14] mm/hmm: fix header file if/else/endif maze Andrew Morton
2018-03-16 21:18 ` Jerome Glisse
2018-03-16 21:35 ` Andrew Morton
2018-03-16 21:40 ` John Hubbard
2018-03-17 1:20 ` [PATCH 02/14] mm/hmm: fix header file if/else/endif maze v2 jglisse
2018-03-16 19:14 ` [PATCH 03/14] mm/hmm: HMM should have a callback before MM is destroyed v2 jglisse
2018-03-16 21:12 ` Andrew Morton
2018-03-16 21:26 ` Jerome Glisse
2018-03-16 21:37 ` John Hubbard
2018-03-17 2:36 ` John Hubbard
2018-03-17 3:47 ` John Hubbard
2018-03-17 4:39 ` John Hubbard
2018-03-16 19:14 ` [PATCH 04/14] mm/hmm: hmm_pfns_bad() was accessing wrong struct jglisse
2018-03-17 2:04 ` John Hubbard
2018-03-16 19:14 ` [PATCH 05/14] mm/hmm: use struct for hmm_vma_fault(), hmm_vma_get_pfns() parameters jglisse
2018-03-17 3:08 ` John Hubbard
2018-03-16 19:14 ` [PATCH 06/14] mm/hmm: remove HMM_PFN_READ flag and ignore peculiar architecture jglisse
2018-03-17 3:30 ` John Hubbard
2018-03-16 19:14 ` [PATCH 07/14] mm/hmm: use uint64_t for HMM pfn instead of defining hmm_pfn_t to ulong jglisse
2018-03-17 3:59 ` John Hubbard
2018-03-16 19:14 ` [PATCH 08/14] mm/hmm: cleanup special vma handling (VM_SPECIAL) jglisse
2018-03-17 4:35 ` John Hubbard
2018-03-16 19:14 ` [PATCH 09/14] mm/hmm: do not differentiate between empty entry or missing directory jglisse
2018-03-19 23:06 ` John Hubbard
2018-03-20 2:08 ` Jerome Glisse
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=20180316191414.3223-3-jglisse@redhat.com \
--to=jglisse@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ebaskakov@nvidia.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rcampbell@nvidia.com \
--cc=stable@vger.kernel.org \
/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).