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

Merge branch 'merge' of git://

* 'merge' of git://
  powerpc: Fix boot problem due to AT_BASE_PLATFORM change
parents 7b35fa86 fc532f81
......@@ -1660,8 +1660,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
* Set the base platform string once; assumes
* we're called with real pvr first.
if (powerpc_base_platform == NULL)
powerpc_base_platform = t->platform;
if (*PTRRELOC(&powerpc_base_platform) == NULL)
*PTRRELOC(&powerpc_base_platform) = t->platform;
#if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
/* ppc64 and booke expect identify_cpu to also call
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment