Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck:
  kmemcheck: add missing braces to do-while in kmemcheck_annotate_bitfield
  kmemcheck: update documentation
  kmemcheck: depend on HAVE_ARCH_KMEMCHECK
  kmemcheck: remove useless check
  kmemcheck: remove duplicated #include

1 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index dc2fd545db0..c8006607f94 100644
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
@@ -144,7 +144,10 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
         int name##_end[0];
 
 #define kmemcheck_annotate_bitfield(ptr, name)                          \
-        do if (ptr) {                                                   \
+        do {                                                            \
+                if (!ptr)                                               \
+                        break;                                          \
+                                                                        \
                 int _n = (long) &((ptr)->name##_end)                    \
                         - (long) &((ptr)->name##_begin);                \
                 BUILD_BUG_ON(_n < 0);                                   \