Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next

[cascardo/linux.git] / include / linux / buffer_head.h

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 89d9aa9..c67f052 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -82,15 +82,15 @@ struct buffer_head {
  * and buffer_foo() functions.
  */
 #define BUFFER_FNS(bit, name)                                          \
-static inline void set_buffer_##name(struct buffer_head *bh)           \
+static __always_inline void set_buffer_##name(struct buffer_head *bh)  \
 {                                                                      \
        set_bit(BH_##bit, &(bh)->b_state);                              \
 }                                                                      \
-static inline void clear_buffer_##name(struct buffer_head *bh)         \
+static __always_inline void clear_buffer_##name(struct buffer_head *bh)        \
 {                                                                      \
        clear_bit(BH_##bit, &(bh)->b_state);                            \
 }                                                                      \
-static inline int buffer_##name(const struct buffer_head *bh)          \
+static __always_inline int buffer_##name(const struct buffer_head *bh) \
 {                                                                      \
        return test_bit(BH_##bit, &(bh)->b_state);                      \
 }
@@ -99,11 +99,11 @@ static inline int buffer_##name(const struct buffer_head *bh)               \
  * test_set_buffer_foo() and test_clear_buffer_foo()
  */
 #define TAS_BUFFER_FNS(bit, name)                                      \
-static inline int test_set_buffer_##name(struct buffer_head *bh)       \
+static __always_inline int test_set_buffer_##name(struct buffer_head *bh) \
 {                                                                      \
        return test_and_set_bit(BH_##bit, &(bh)->b_state);              \
 }                                                                      \
-static inline int test_clear_buffer_##name(struct buffer_head *bh)     \
+static __always_inline int test_clear_buffer_##name(struct buffer_head *bh) \
 {                                                                      \
        return test_and_clear_bit(BH_##bit, &(bh)->b_state);            \
 }                                                                      \