lkml.org 
[lkml]   [2009]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] kmemcheck: clean up kmemcheck_annotate_bitfield
Date
The commit 181f7c5dd3832763bdf2756b6d2d8a49bdf12791 change traded a
style warning from sparse for a syntax warning from the real compiler
(and perhaps an error with compilers old enough). The use of a local
variable inside BUILD_BUG_ON() is pretty questionable too, though it
works with the compiler's constant-folding in practice.

This change cleans it all up a little more sanely.
The details are self-explanatory.

Signed-off-by: Roland McGrath <roland@redhat.com>
CC: Johannes Berg <johannes@sipsolutions.net>
CC: Vegard Nossum <vegard.nossum@gmail.com>
---
include/linux/kmemcheck.h | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index c800660..9e2c5f4 100644
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
@@ -143,16 +143,14 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
#define kmemcheck_bitfield_end(name) \
int name##_end[0];

+#define kmemcheck_bitfield_stretch(ptr, name) \
+ ((long) &(ptr)->name##_end - (long) &(ptr)->name##_begin)
+
#define kmemcheck_annotate_bitfield(ptr, name) \
do { \
- if (!ptr) \
- break; \
- \
- int _n = (long) &((ptr)->name##_end) \
- - (long) &((ptr)->name##_begin); \
- BUILD_BUG_ON(_n < 0); \
- \
- kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
+ BUILD_BUG_ON(kmemcheck_bitfield_stretch(ptr, name) < 0);\
+ kmemcheck_mark_initialized(&(ptr)->name##_begin, \
+ kmemcheck_bitfield_stretch(ptr, name)); \
} while (0)

#define kmemcheck_annotate_variable(var) \

\
 
 \ /
  Last update: 2009-09-23 02:17    [W:0.030 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site