Commit f011a08c authored Apr 08, 2013 by Linus Torvalds

next-fixes

Pull powerpc bugfix from Stephen Rothwell:
 "A single BUG_ON fix for a condition that could happen for machines
  with certain hardware installed."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes:
  powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test

parents 79e5f05e 9fb26401

arch/powerpc/platforms/pseries/lpar.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,13 @@ static long pSeries_lpar_hpte_remove(unsigned long hpte_group)
		(0x1UL << 4), &dummy1, &dummy2);
		if (lpar_rc == H_SUCCESS)
		return i;
		BUG_ON(lpar_rc != H_NOT_FOUND);

		/*
		* The test for adjunct partition is performed before the
		* ANDCOND test. H_RESOURCE may be returned, so we need to
		* check for that as well.
		*/
		BUG_ON(lpar_rc != H_NOT_FOUND && lpar_rc != H_RESOURCE);

		slot_offset++;
		slot_offset &= 0x7;