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

diff --combined include/linux/random.h
index 13aeaf5a4bd4e30275da374ef384091dad9d4484,d4eb9b3789ad24f0240d5499257b06a3d8391a5a..1f7dced2bba66b8afe6f0824ee8dba615f0fb8cc
--- 1/include/linux/random.h
--- 2/include/linux/random.h
+++ b/include/linux/random.h
@@@ -20,7 -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,
@@@ -36,7 -36,6 +36,7 @@@ extern void add_interrupt_randomness(in
  
  extern void get_random_bytes(void *buf, int nbytes);
  extern int wait_for_random_bytes(void);
 +extern int __init rand_initialize(void);
  extern bool rng_is_initialized(void);
  extern int add_random_ready_callback(struct random_ready_callback *rdy);
  extern void del_random_ready_callback(struct random_ready_callback *rdy);