diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-11 14:10:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-11 14:10:51 -0800 |
| commit | a06caa4a68ce7d134b342966e65e7bd2dfa2eead (patch) | |
| tree | 2583b46f14223de1b05aca8e4f88e1c0f19707cd /include/linux/build_bug.h | |
| parent | 94801e5c6d461045726e1563ba2369ef7ce21dbf (diff) | |
| parent | ba9c1201beaa86a773e83be5654602a0667e4a4d (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"8 patches.
Subsystems affected by this patch series: proc, selftests, kbuild, and
mm (pagecache, kasan, hugetlb)"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/hugetlb: clear compound_nr before freeing gigantic pages
kasan: fix object remaining in offline per-cpu quarantine
elfcore: fix building with clang
initramfs: fix clang build failure
kbuild: avoid static_assert for genksyms
selftest/fpu: avoid clang warning
proc: use untagged_addr() for pagemap_read addresses
revert "mm/filemap: add static for function __add_to_page_cache_locked"
Diffstat (limited to 'include/linux/build_bug.h')
| -rw-r--r-- | include/linux/build_bug.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h index e3a0be2c90ad..7bb66e15b481 100644 --- a/include/linux/build_bug.h +++ b/include/linux/build_bug.h @@ -77,4 +77,9 @@ #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr) #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) +#ifdef __GENKSYMS__ +/* genksyms gets confused by _Static_assert */ +#define _Static_assert(expr, ...) +#endif + #endif /* _LINUX_BUILD_BUG_H */ |