diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:20:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:20:37 +1100 |
| commit | 7ab06f14c76d9a4638df1c12f0c576b38d757b8f (patch) | |
| tree | d7940475c52a7deff40f2499deb28eefa866407b /include/linux/kmemcheck.h | |
| parent | 62e02dbb82baf1a56595188bf25b7b32b00adf34 (diff) | |
| parent | e12c6060acad557bdb604412623bbb2521eb4f61 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
Diffstat (limited to 'include/linux/kmemcheck.h')
| -rw-r--r-- | include/linux/kmemcheck.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h index 08d7dc4ddf40..39f8453239f7 100644 --- a/include/linux/kmemcheck.h +++ b/include/linux/kmemcheck.h @@ -76,7 +76,7 @@ bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size); \ _n = (long) &((ptr)->name##_end) \ - (long) &((ptr)->name##_begin); \ - MAYBE_BUILD_BUG_ON(_n < 0); \ + BUILD_BUG_ON(_n < 0); \ \ kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \ } while (0) |