9 files changed, 17 insertions, 35 deletions

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index df1d6a150f30..de8521fc9de5 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -10,6 +10,8 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
+KBUILD_DEFCONFIG := defconfig
+
 LD_BFD          := elf64-s390
 KBUILD_LDFLAGS  := -m elf64_s390
 KBUILD_AFLAGS_MODULE += -fPIC
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index c51496bbac19..7cba96e7587b 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -58,7 +58,6 @@ define cmd_section_cmp
         touch $@
 endef
 
-OBJCOPYFLAGS_bzImage := --pad-to $$(readelf -s $(obj)/compressed/vmlinux | awk '/\<_end\>/ {print or(strtonum("0x"$$2),4095)+1}')
 $(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE
         $(call if_changed,objcopy)
 
diff --git a/arch/s390/boot/compressed/vmlinux.lds.S b/arch/s390/boot/compressed/vmlinux.lds.S
index 112b8d9f1e4c..635217eb3d91 100644
--- a/arch/s390/boot/compressed/vmlinux.lds.S
+++ b/arch/s390/boot/compressed/vmlinux.lds.S
@@ -77,6 +77,8 @@ SECTIONS
                 _compressed_start = .;
                 *(.vmlinux.bin.compressed)
                 _compressed_end = .;
+                FILL(0xff);
+                . = ALIGN(4096);
         }
         . = ALIGN(256);
         .bss : {
diff --git a/arch/s390/defconfig b/arch/s390/configs/defconfig
index c59b922cb6c5..c59b922cb6c5 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/configs/defconfig
diff --git a/arch/s390/mm/kasan_init.c b/arch/s390/mm/kasan_init.c
index 01892dcf4029..0c1f257be422 100644
--- a/arch/s390/mm/kasan_init.c
+++ b/arch/s390/mm/kasan_init.c
@@ -28,7 +28,7 @@ static void __init kasan_early_panic(const char *reason)
 {
         sclp_early_printk("The Linux kernel failed to boot with the KernelAddressSanitizer:\n");
         sclp_early_printk(reason);
-        disabled_wait(0);
+        disabled_wait();
 }
 
 static void * __init kasan_early_alloc_segment(void)
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index cfce255521ac..7b7620de2acd 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -205,17 +205,22 @@ static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
                                  int auto_ack, int merge_pending)
 {
         unsigned char __state = 0;
-        int i;
+        int i = 1;
 
         if (is_qebsm(q))
                 return qdio_do_eqbs(q, state, bufnr, count, auto_ack);
 
         /* get initial state: */
         __state = q->slsb.val[bufnr];
+
+        /* Bail out early if there is no work on the queue: */
+        if (__state & SLSB_OWNER_CU)
+                goto out;
+
         if (merge_pending && __state == SLSB_P_OUTPUT_PENDING)
                 __state = SLSB_P_OUTPUT_EMPTY;
 
-        for (i = 1; i < count; i++) {
+        for (; i < count; i++) {
                 bufnr = next_buf(bufnr);
 
                 /* merge PENDING into EMPTY: */
@@ -228,6 +233,8 @@ static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
                 if (q->slsb.val[bufnr] != __state)
                         break;
         }
+
+out:
         *state = __state;
         return i;
 }
@@ -382,7 +389,7 @@ int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,
 {
         if (need_siga_sync(q))
                 qdio_siga_sync_q(q);
-        return get_buf_states(q, bufnr, state, 1, 0, 0);
+        return get_buf_state(q, bufnr, state, 0);
 }
 
 static inline void qdio_stop_polling(struct qdio_q *q)
@@ -719,11 +726,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q, unsigned int start)
                     multicast_outbound(q)))
                         qdio_siga_sync_q(q);
 
-        /*
-         * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
-         * would return 0.
-         */
-        count = min(atomic_read(&q->nr_buf_used), QDIO_MAX_BUFFERS_MASK);
+        count = atomic_read(&q->nr_buf_used);
         if (!count)
                 return 0;
 
diff --git a/drivers/s390/cio/trace.c b/drivers/s390/cio/trace.c
index e331cd97e83b..882ee538ca30 100644
--- a/drivers/s390/cio/trace.c
+++ b/drivers/s390/cio/trace.c
@@ -21,5 +21,4 @@ EXPORT_TRACEPOINT_SYMBOL(s390_cio_csch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_hsch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_xsch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_rsch);
-EXPORT_TRACEPOINT_SYMBOL(s390_cio_rchp);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_chsc);
diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h
index 0ebb29b6fd6d..4803139bce14 100644
--- a/drivers/s390/cio/trace.h
+++ b/drivers/s390/cio/trace.h
@@ -274,29 +274,6 @@ DEFINE_EVENT(s390_class_schid, s390_cio_rsch,
         TP_ARGS(schid, cc)
 );
 
-/**
- * s390_cio_rchp - Reset Channel Path (RCHP) instruction was performed
- * @chpid: Channel-Path Identifier
- * @cc: Condition code
- */
-TRACE_EVENT(s390_cio_rchp,
-        TP_PROTO(struct chp_id chpid, int cc),
-        TP_ARGS(chpid, cc),
-        TP_STRUCT__entry(
-                __field(u8, cssid)
-                __field(u8, id)
-                __field(int, cc)
-        ),
-        TP_fast_assign(
-                __entry->cssid = chpid.cssid;
-                __entry->id = chpid.id;
-                __entry->cc = cc;
-        ),
-        TP_printk("chpid=%x.%02x cc=%d", __entry->cssid, __entry->id,
-                  __entry->cc
-        )
-);
-
 #define CHSC_MAX_REQUEST_LEN            64
 #define CHSC_MAX_RESPONSE_LEN           64
 
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,