6 files changed, 12 insertions, 4 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index aad23e3dff2c..bf24ab188921 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -4,6 +4,9 @@ config MMU
 config ZONE_DMA
         def_bool y
 
+config CPU_BIG_ENDIAN
+        def_bool y
+
 config LOCKDEP_SUPPORT
         def_bool y
 
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index b6bfa169a002..535a46d46d28 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -44,7 +44,8 @@ struct zpci_fmb {
         u64 rpcit_ops;
         u64 dma_rbytes;
         u64 dma_wbytes;
-} __packed __aligned(64);
+        u64 pad[2];
+} __packed __aligned(128);
 
 enum zpci_state {
         ZPCI_FN_STATE_RESERVED,
diff --git a/arch/s390/include/asm/seccomp.h b/arch/s390/include/asm/seccomp.h
index 781a9cf9b002..e10f8337367b 100644
--- a/arch/s390/include/asm/seccomp.h
+++ b/arch/s390/include/asm/seccomp.h
@@ -13,4 +13,6 @@
 #define __NR_seccomp_exit_32    __NR_exit
 #define __NR_seccomp_sigreturn_32 __NR_sigreturn
 
+#include <asm-generic/seccomp.h>
+
 #endif  /* _ASM_S390_SECCOMP_H */
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index d4549c964589..e5f50a7d2f4e 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -105,6 +105,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)
                         if (_raw_compare_and_swap(&lp->lock, 0, cpu))
                                 return;
                         local_irq_restore(flags);
+                        continue;
                 }
                 /* Check if the lock owner is running. */
                 if (first_diag && cpu_is_preempted(~owner)) {
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 1bce9cf51b1e..b83908670a9a 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -756,15 +756,16 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
-        device_unregister(&dev_info->dev);
 
         /* unload all related segments */
         list_for_each_entry(entry, &dev_info->seg_list, lh)
                 segment_unload(entry->segment_name);
 
-        put_device(&dev_info->dev);
         up_write(&dcssblk_devices_sem);
 
+        device_unregister(&dev_info->dev);
+        put_device(&dev_info->dev);
+
         rc = count;
 out_buf:
         kfree(local_buf);
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 75d9896deccb..e6f54d3b8969 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -303,7 +303,7 @@ static void scm_blk_request(struct request_queue *rq)
                 if (req->cmd_type != REQ_TYPE_FS) {
                         blk_start_request(req);
                         blk_dump_rq_flags(req, KMSG_COMPONENT " bad request");
-                        blk_end_request_all(req, -EIO);
+                        __blk_end_request_all(req, -EIO);
                         continue;
                 }