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

Commit 9d646c97 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 s390 bugfix from Martin Schwidefsky:
 "One last s390 patch for 4.12

  Revert the re-IPL semantics back to the v4.7 state. It turned out that
  the memory layout may change due to memory hotplug if load-normal is
  used"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL
parents c0bc126f 4130b28f

arch/s390/kernel/ipl.c

+1 −6
Original line number Diff line number Diff line
@@ -564,8 +564,6 @@ static struct kset *ipl_kset; 


static void __ipl_run(void *unused)

{

	if (MACHINE_IS_LPAR && ipl_info.type == IPL_TYPE_CCW)

		diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);

	diag308(DIAG308_LOAD_CLEAR, NULL);

	if (MACHINE_IS_VM)

		__cpcmd("IPL", NULL, 0, NULL);
@@ -1088,9 +1086,6 @@ static void __reipl_run(void *unused) 
		break;

	case REIPL_METHOD_CCW_DIAG:

		diag308(DIAG308_SET, reipl_block_ccw);

		if (MACHINE_IS_LPAR)

			diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);

		else

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_FCP_RW_DIAG: