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

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

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix boot problem due to AT_BASE_PLATFORM change
parents 7b35fa86 fc532f81

arch/powerpc/kernel/cputable.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1660,8 +1660,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr) 
			 * Set the base platform string once; assumes

			 * Set the base platform string once; assumes

			 * we're called with real pvr first.

			 * we're called with real pvr first.

			 */

			 */

			if (powerpc_base_platform == NULL)

			if (*PTRRELOC(&powerpc_base_platform) == NULL)

				powerpc_base_platform = t->platform;

				*PTRRELOC(&powerpc_base_platform) = t->platform;





#if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)

#if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)

			/* ppc64 and booke expect identify_cpu to also call

			/* ppc64 and booke expect identify_cpu to also call