tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e89f3821 7b35fa86

+2 -2
unified split
+2 -2
arch/powerpc/kernel/cputable.c
··· 1660 * Set the base platform string once; assumes 1661 * we're called with real pvr first. 1662 */ 1663 - if (powerpc_base_platform == NULL) 1664 - powerpc_base_platform = t->platform; 1665 1666 #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) 1667 /* ppc64 and booke expect identify_cpu to also call
··· 1660 * Set the base platform string once; assumes 1661 * we're called with real pvr first. 1662 */ 1663 + if (*PTRRELOC(&powerpc_base_platform) == NULL) 1664 + *PTRRELOC(&powerpc_base_platform) = t->platform; 1665 1666 #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) 1667 /* ppc64 and booke expect identify_cpu to also call