mac80211: move control.hw_key assignment

[safe/jmp/linux-2.6] / include / linux / kmemcheck.h

diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index c800660..e880d4c 100644 (file)
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
@@ -145,12 +145,14 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
 
 #define kmemcheck_annotate_bitfield(ptr, name)                         \
        do {                                                            \
+               int _n;                                                 \
+                                                                       \
                if (!ptr)                                               \
                        break;                                          \
                                                                        \
-               int _n = (long) &((ptr)->name##_end)                    \
+               _n = (long) &((ptr)->name##_end)                        \
                        - (long) &((ptr)->name##_begin);                \
-               BUILD_BUG_ON(_n < 0);                                   \
+               MAYBE_BUILD_BUG_ON(_n < 0);                             \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
        } while (0)