Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (653c574a) · Commits · 戴 / test

Pull s390 fixes from Martin Schwidefsky: "Another two bug fixes for 4.7: - The revert of patch which removed boot information for systems using an intermediate boot kernel, e.g. the SLES12 grub setup. - A fix for an incorrect inline assembly constraint that causes broken code to be generated with gcc 4.8.5" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: fix test_fp_ctl inline assembly contraints Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"

arch/s390/include/asm/fpu/api.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ static inline int test_fp_ctl(u32 fpc)
		" la %0,0\n"
		"1:\n"
		EX_TABLE(0b,1b)
		: "=d" (rc), "=d" (orig_fpc)
		: "=d" (rc), "=&d" (orig_fpc)
		: "d" (fpc), "0" (-EINVAL));
		return rc;
		}

arch/s390/kernel/ipl.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -2064,12 +2064,5 @@ void s390_reset_system(void)
		S390_lowcore.program_new_psw.addr =
		(unsigned long) s390_base_pgm_handler;

		/*
		* Clear subchannel ID and number to signal new kernel that no CCW or
		* SCSI IPL has been done (for kexec and kdump)
		*/
		S390_lowcore.subchannel_id = 0;
		S390_lowcore.subchannel_nr = 0;

		do_reset_calls();
		}

Admin message