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>,
"Ralph Campbell" <rcampbell@nvidia.com>,
"John Hubbard" <jhubbard@nvidia.com>,
"Evgeny Baskakov" <ebaskakov@nvidia.com>
Subject: [PATCH 2/4] mm/hmm: fix header file if/else/endif maze
Date: Thu, 15 Mar 2018 14:36:58 -0400 [thread overview]
Message-ID: <20180315183700.3843-3-jglisse@redhat.com> (raw)
In-Reply-To: <20180315183700.3843-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>
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-15 18:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 18:36 [PATCH 0/4] hmm: fixes and documentations jglisse
2018-03-15 18:36 ` [PATCH 1/4] mm/hmm: documentation editorial update to HMM documentation jglisse
2018-03-15 18:36 ` jglisse [this message]
2018-03-16 0:11 ` [PATCH 2/4] mm/hmm: fix header file if/else/endif maze Balbir Singh
2018-03-17 0:53 ` kbuild test robot
2018-03-15 18:36 ` [PATCH 3/4] mm/hmm: HMM should have a callback before MM is destroyed jglisse
2018-03-15 22:48 ` Andrew Morton
2018-03-16 0:54 ` Jerome Glisse
2018-03-16 1:17 ` John Hubbard
2018-03-20 11:33 ` Michal Hocko
2018-03-20 14:45 ` Jerome Glisse
2018-03-15 18:37 ` [PATCH 4/4] mm/hmm: change CPU page table snapshot functions to simplify drivers jglisse
2018-03-16 5:08 ` John Hubbard
2018-03-16 19:19 ` 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=20180315183700.3843-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 \
/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