Some of the mm_flags helpers are defined in <linux/mm_types.h>, while others are defined in <linux/mm.h>. We will soon need to call one of the latter helpers from mm_types.h.
Regroup all the helpers in mm_types.h to keep things simple. Also remove #include's that were added specifically for these helpers in mm.h. Signed-off-by: Kevin Brodsky <[email protected]> --- include/linux/mm.h | 32 -------------------------------- include/linux/mm_types.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 32bb723ffbb9..7a4b8e7ac8f4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -34,8 +34,6 @@ #include <linux/slab.h> #include <linux/cacheinfo.h> #include <linux/rcuwait.h> -#include <linux/bitmap.h> -#include <linux/bitops.h> #include <linux/iommu-debug-pagealloc.h> #include <linux/kcsan-checks.h> @@ -948,36 +946,6 @@ static inline void assert_fault_locked(const struct vm_fault *vmf) } #endif /* CONFIG_PER_VMA_LOCK */ -static inline bool mm_flags_test(int flag, const struct mm_struct *mm) -{ - return test_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); -} - -static inline bool mm_flags_test_and_set(int flag, struct mm_struct *mm) -{ - return test_and_set_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); -} - -static inline bool mm_flags_test_and_clear(int flag, struct mm_struct *mm) -{ - return test_and_clear_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); -} - -static inline void mm_flags_set(int flag, struct mm_struct *mm) -{ - set_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); -} - -static inline void mm_flags_clear(int flag, struct mm_struct *mm) -{ - clear_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); -} - -static inline void mm_flags_clear_all(struct mm_struct *mm) -{ - bitmap_zero(ACCESS_PRIVATE(&mm->flags, __mm_flags), NUM_MM_FLAG_BITS); -} - extern const struct vm_operations_struct vma_dummy_vm_ops; static inline void vma_init(struct vm_area_struct *vma, struct mm_struct *mm) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index b4129beb9c4a..a2e0dc5892ff 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1414,6 +1414,36 @@ struct mm_struct { char flexible_array[] __aligned(__alignof__(unsigned long)); }; +static inline bool mm_flags_test(int flag, const struct mm_struct *mm) +{ + return test_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); +} + +static inline bool mm_flags_test_and_set(int flag, struct mm_struct *mm) +{ + return test_and_set_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); +} + +static inline bool mm_flags_test_and_clear(int flag, struct mm_struct *mm) +{ + return test_and_clear_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); +} + +static inline void mm_flags_set(int flag, struct mm_struct *mm) +{ + set_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); +} + +static inline void mm_flags_clear(int flag, struct mm_struct *mm) +{ + clear_bit(flag, ACCESS_PRIVATE(&mm->flags, __mm_flags)); +} + +static inline void mm_flags_clear_all(struct mm_struct *mm) +{ + bitmap_zero(ACCESS_PRIVATE(&mm->flags, __mm_flags), NUM_MM_FLAG_BITS); +} + /* Copy value to the first system word of mm flags, non-atomically. */ static inline void __mm_flags_overwrite_word(struct mm_struct *mm, unsigned long value) { -- 2.51.2
