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

[pandora-kernel.git] / include / linux / kmemcheck.h

diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index dc2fd54..c800660 100644 (file)
--- 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)                         \
        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);                                   \
                int _n = (long) &((ptr)->name##_end)                    \
                        - (long) &((ptr)->name##_begin);                \
                BUILD_BUG_ON(_n < 0);                                   \