mm/hmm: fix header file if/else/endif maze (b28b08de) · Commits · 戴 / test

The #if/#else/#endif for IS_ENABLED(CONFIG_HMM) were wrong. Because of this after multiple include there was multiple definition of both hmm_mm_init() and hmm_mm_destroy() leading to build failure if HMM was enabled (CONFIG_HMM set). Link: http://lkml.kernel.org/r/20180323005527.758-3-jglisse@redhat.com Signed-off-by:

Jérôme Glisse <jglisse@redhat.com> Acked-by:

Balbir Singh <bsingharora@gmail.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> Cc: <stable@vger.kernel.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/hmm.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -498,23 +498,16 @@ 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 */
		#endif /* IS_ENABLED(CONFIG_HMM) */

		/* Below are for HMM internal use only! Not to be used by device driver! */
		#if IS_ENABLED(CONFIG_HMM_MIRROR)
		void hmm_mm_destroy(struct mm_struct *mm);

		static inline void hmm_mm_init(struct mm_struct *mm)
		{
		mm->hmm = NULL;
		}
		#else /* IS_ENABLED(CONFIG_HMM_MIRROR) */
		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 /* IS_ENABLED(CONFIG_HMM) */
		#endif /* LINUX_HMM_H */

Admin message