diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-17 10:08:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-17 10:08:59 -0700 |
| commit | 80111bfb672d8c04d60c25559243554f732f2848 (patch) | |
| tree | cd8d31f04532d9be6a43f344213bf85e5a228577 /include | |
| parent | bf8a9a4755737f6630756f0d87bea9b38f0ed369 (diff) | |
| parent | f3e20ad67b4c8365df9818fd3c8026e105d6b53a (diff) | |
| download | linux-80111bfb672d8c04d60c25559243554f732f2848.tar.bz2 | |
Merge tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky:
- Enhancements for the QDIO layer
- Remove the RCP trace event
- Avoid three build issues
- Move the defconfig to the configs directory
* tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: move arch/s390/defconfig to arch/s390/configs/defconfig
s390/qdio: optimize state inspection of HW-owned SBALs
s390/qdio: use get_buf_state() in debug_get_buf_state()
s390/qdio: allow to scan all Output SBALs in one go
s390/cio: Remove tracing for rchp instruction
s390/kasan: adapt disabled_wait usage to avoid build error
latent_entropy: avoid build error when plugin cflags are not set
s390/boot: fix compiler error due to missing awk strtonum
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/random.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/random.h b/include/linux/random.h index 13aeaf5a4bd4..1f7dced2bba6 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -20,7 +20,7 @@ struct random_ready_callback { extern void add_device_randomness(const void *, unsigned int); -#if defined(CONFIG_GCC_PLUGIN_LATENT_ENTROPY) && !defined(__CHECKER__) +#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__) static inline void add_latent_entropy(void) { add_device_randomness((const void *)&latent_entropy, |