diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
| commit | a2e5790d841658485d642196dbb0927303d6c22f (patch) | |
| tree | b3d28c9bcb7da6880806146fd22a88a7ee7f733e /include/linux/build_bug.h | |
| parent | ab2d92ad881da11331280aedf612d82e61cb6d41 (diff) | |
| parent | 60c3e026d73ccabb075fb70ba02f8512ab40cf2c (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc updates from Andrew Morton:
- kasan updates
- procfs
- lib/bitmap updates
- other lib/ updates
- checkpatch tweaks
- rapidio
- ubsan
- pipe fixes and cleanups
- lots of other misc bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
Documentation/sysctl/user.txt: fix typo
MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns
MAINTAINERS: update various PALM patterns
MAINTAINERS: update "ARM/OXNAS platform support" patterns
MAINTAINERS: update Cortina/Gemini patterns
MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern
MAINTAINERS: remove ANDROID ION pattern
mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors
mm: docs: fix parameter names mismatch
mm: docs: fixup punctuation
pipe: read buffer limits atomically
pipe: simplify round_pipe_size()
pipe: reject F_SETPIPE_SZ with size over UINT_MAX
pipe: fix off-by-one error when checking buffer limits
pipe: actually allow root to exceed the pipe buffer limits
pipe, sysctl: remove pipe_proc_fn()
pipe, sysctl: drop 'min' parameter from pipe-max-size converter
kasan: rework Kconfig settings
crash_dump: is_kdump_kernel can be boolean
kernel/mutex: mutex_is_locked can be boolean
...
Diffstat (limited to 'include/linux/build_bug.h')
| -rw-r--r-- | include/linux/build_bug.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h index 3efed0d742a0..43d1fd50d433 100644 --- a/include/linux/build_bug.h +++ b/include/linux/build_bug.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #define __BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) | 8 | #define __BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) |
| 9 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) | 9 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) |
| 10 | #define BUILD_BUG_ON_ZERO(e) (0) | 10 | #define BUILD_BUG_ON_ZERO(e) (0) |
| 11 | #define BUILD_BUG_ON_NULL(e) ((void *)0) | ||
| 12 | #define BUILD_BUG_ON_INVALID(e) (0) | 11 | #define BUILD_BUG_ON_INVALID(e) (0) |
| 13 | #define BUILD_BUG_ON_MSG(cond, msg) (0) | 12 | #define BUILD_BUG_ON_MSG(cond, msg) (0) |
| 14 | #define BUILD_BUG_ON(condition) (0) | 13 | #define BUILD_BUG_ON(condition) (0) |
| @@ -28,7 +27,6 @@ | |||
| 28 | * aren't permitted). | 27 | * aren't permitted). |
| 29 | */ | 28 | */ |
| 30 | #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:(-!!(e)); })) | 29 | #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:(-!!(e)); })) |
| 31 | #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:(-!!(e)); })) | ||
| 32 | 30 | ||
| 33 | /* | 31 | /* |
| 34 | * BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the | 32 | * BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the |