Commit d22113a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 bug fixes from Martin Schwidefsky:

 - Fix overwrite of the initial ramdisk due to misuse of IS_ENABLED

 - Fix integer overflow in the dasd driver resulting in incorrect number
   of blocks for large devices

 - Fix a lockdep false positive in the 3270 driver

 - Fix a deadlock in the zcrypt driver

 - Fix incorrect debug feature entries in the pkey api

 - Fix inline assembly constraints fallout with CONFIG_KASAN=y

* tag 's390-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: correct some inline assembly constraints
  s390/pkey: add one more argument space for debug feature entry
  s390/zcrypt: fix possible deadlock situation on ap queue remove
  s390/3270: fix lockdep false positive on view->lock
  s390/dasd: Fix capacity calculation for large volumes
  s390/mem_detect: Use IS_ENABLED(CONFIG_BLK_DEV_INITRD)
parents 2a852fd1 35af0d46

arch/s390/boot/mem_detect.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static void *mem_detect_alloc_extended(void) 
{

	unsigned long offset = ALIGN(mem_safe_offset(), sizeof(u64));



	if (IS_ENABLED(BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&

	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&

	    INITRD_START < offset + ENTRIES_EXTENDED_MAX)

		offset = ALIGN(INITRD_START + INITRD_SIZE, sizeof(u64));

arch/s390/kernel/fpu.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void __kernel_fpu_begin(struct kernel_fpu *state, u32 flags) 


	if (flags & KERNEL_FPC)

		/* Save floating point control */

		asm volatile("stfpc %0" : "=m" (state->fpc));

		asm volatile("stfpc %0" : "=Q" (state->fpc));



	if (!MACHINE_HAS_VX) {

		if (flags & KERNEL_VXR_V0V7) {

arch/s390/kernel/vtime.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static inline u64 get_vtimer(void) 
{

	u64 timer;



	asm volatile("stpt %0" : "=m" (timer));

	asm volatile("stpt %0" : "=Q" (timer));

	return timer;

}
@@ -48,7 +48,7 @@ static inline void set_vtimer(u64 expires) 
	asm volatile(

		"	stpt	%0\n"	/* Store current cpu timer value */

		"	spt	%1"	/* Set new value imm. afterwards */

		: "=m" (timer) : "m" (expires));

		: "=Q" (timer) : "Q" (expires));

	S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer;

	S390_lowcore.last_update_timer = expires;

}
@@ -135,8 +135,8 @@ static int do_account_vtime(struct task_struct *tsk) 
#else

		"	stck	%1"	/* Store current tod clock value */

#endif

		: "=m" (S390_lowcore.last_update_timer),

		  "=m" (S390_lowcore.last_update_clock));

		: "=Q" (S390_lowcore.last_update_timer),

		  "=Q" (S390_lowcore.last_update_clock));

	clock = S390_lowcore.last_update_clock - clock;

	timer -= S390_lowcore.last_update_timer;

drivers/s390/block/dasd_eckd.c

+3 −3
Original line number Diff line number Diff line
@@ -2004,14 +2004,14 @@ static int dasd_eckd_end_analysis(struct dasd_block *block) 
	blk_per_trk = recs_per_track(&private->rdc_data, 0, block->bp_block);



raw:

	block->blocks = (private->real_cyl *

	block->blocks = ((unsigned long) private->real_cyl *

			  private->rdc_data.trk_per_cyl *

			  blk_per_trk);



	dev_info(&device->cdev->dev,

		 "DASD with %d KB/block, %d KB total size, %d KB/track, "

		 "DASD with %u KB/block, %lu KB total size, %u KB/track, "

		 "%s\n", (block->bp_block >> 10),

		 ((private->real_cyl *

		 (((unsigned long) private->real_cyl *

		   private->rdc_data.trk_per_cyl *

		   blk_per_trk * (block->bp_block >> 9)) >> 1),

		 ((blk_per_trk * block->bp_block) >> 10),

drivers/s390/char/con3270.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ con3270_init(void) 
		     (void (*)(unsigned long)) con3270_read_tasklet,

		     (unsigned long) condev->read);



	raw3270_add_view(&condev->view, &con3270_fn, 1);

	raw3270_add_view(&condev->view, &con3270_fn, 1, RAW3270_VIEW_LOCK_IRQ);



	INIT_LIST_HEAD(&condev->freemem);

	for (i = 0; i < CON3270_STRING_PAGES; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE