Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c669275 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Martin Schwidefsky:

 - The fixup for the blk-mq clash with the scm driver

 - An improvement for the dasd driver in regard to raw I/O

 - Bug fixes and cleanup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  Update my email address
  s390/syscalls: Fix out of bounds arguments access
  s390/vfio_ccw: remove unused variable
  s390/dasd: remove unneeded code
  s390/crash: Remove unused KEXEC_NOTE_BYTES
  s390/zcrypt: Fix missing newlines at some debug feature messages.
  s390/dasd: Make raw I/O usable without prefix support
  s390/dasd: Rename dasd_raw_build_cp()
  s390/dasd: Refactor prefix_LRE() and related functions
  s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t"
parents 6e6c5b96 0c6b2975

arch/s390/include/asm/kexec.h

+0 −18
Original line number Diff line number Diff line
@@ -41,24 +41,6 @@ 
/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_S390



/*

 * Size for s390x ELF notes per CPU

 *

 * Seven notes plus zero note at the end: prstatus, fpregset, timer,

 * tod_cmp, tod_reg, control regs, and prefix

 */

#define KEXEC_NOTE_BYTES \

	(ALIGN(sizeof(struct elf_note), 4) * 8 + \

	 ALIGN(sizeof("CORE"), 4) * 7 + \

	 ALIGN(sizeof(struct elf_prstatus), 4) + \

	 ALIGN(sizeof(elf_fpregset_t), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u32), 4) + \

	 ALIGN(sizeof(u64) * 16, 4) + \

	 ALIGN(sizeof(u32), 4) \

	)



/* Provide a dummy definition to avoid build failures. */

static inline void crash_setup_regs(struct pt_regs *newregs,

					struct pt_regs *oldregs) { }

arch/s390/include/asm/syscall.h

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ static inline void syscall_get_arguments(struct task_struct *task, 
{

	unsigned long mask = -1UL;



	/*

	 * No arguments for this syscall, there's nothing to do.

	 */

	if (!n)

		return;



	BUG_ON(i + n > 6);

#ifdef CONFIG_COMPAT

	if (test_tsk_thread_flag(task, TIF_31BIT))

drivers/s390/block/dasd.c

+1 −2
Original line number Diff line number Diff line
@@ -3921,7 +3921,6 @@ EXPORT_SYMBOL(dasd_schedule_requeue); 
int dasd_generic_pm_freeze(struct ccw_device *cdev)

{

	struct dasd_device *device = dasd_device_from_cdev(cdev);

	int rc;



	if (IS_ERR(device))

		return PTR_ERR(device);
@@ -3930,7 +3929,7 @@ int dasd_generic_pm_freeze(struct ccw_device *cdev) 
	set_bit(DASD_FLAG_SUSPENDED, &device->flags);



	if (device->discipline->freeze)

		rc = device->discipline->freeze(device);

		device->discipline->freeze(device);



	/* disallow new I/O  */

	dasd_device_set_stop_bits(device, DASD_STOPPED_PM);

drivers/s390/block/dasd_alias.c

+1 −2
Original line number Diff line number Diff line
@@ -754,7 +754,6 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu) 
	struct alias_pav_group *pavgroup;

	struct dasd_device *device, *temp;

	struct dasd_eckd_private *private;

	int rc;

	unsigned long flags;

	LIST_HEAD(active);
@@ -785,7 +784,7 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu) 
		device = list_first_entry(&active, struct dasd_device,

					  alias_list);

		spin_unlock_irqrestore(&lcu->lock, flags);

		rc = dasd_flush_device_queue(device);

		dasd_flush_device_queue(device);

		spin_lock_irqsave(&lcu->lock, flags);

		/*

		 * only move device around if it wasn't moved away while we

drivers/s390/block/dasd_devmap.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int __init dasd_busid(char *str, int *id0, int *id1, int *devno) 
	/* Old style 0xXXXX or XXXX */

	if (!kstrtouint(str, 16, &val)) {

		*id0 = *id1 = 0;

		if (val < 0 || val > 0xffff)

		if (val > 0xffff)

			return -EINVAL;

		*devno = val;

		return 0;