diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /include/linux/kernel.h | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
Merge branch 'linus' into next
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index fb0e7329fee1..953352a88336 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -671,8 +671,8 @@ struct sysinfo { | |||
| 671 | 671 | ||
| 672 | #ifdef __CHECKER__ | 672 | #ifdef __CHECKER__ |
| 673 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) | 673 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) |
| 674 | #define BUILD_BUG_ON_ZERO(e) | 674 | #define BUILD_BUG_ON_ZERO(e) (0) |
| 675 | #define BUILD_BUG_ON_NULL(e) | 675 | #define BUILD_BUG_ON_NULL(e) ((void*)0) |
| 676 | #define BUILD_BUG_ON(condition) | 676 | #define BUILD_BUG_ON(condition) |
| 677 | #else /* __CHECKER__ */ | 677 | #else /* __CHECKER__ */ |
| 678 | 678 | ||