Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 89d9aa9e79bf..c67f052cc5e5 100644
--- 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);            \
 }                                                                       \