Revert "[POWERPC] Do firmware feature fixups after features are initialised"
This reverts commit 5a26f6bbb7
.
The original patch causes boot failures when built with ppc64_defconfig. The
quickest fix is to revert it while alterates are investigated.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4f3731da16
commit
826ea8f22c
1 changed files with 4 additions and 8 deletions
|
@ -350,11 +350,13 @@ void __init setup_system(void)
|
||||||
{
|
{
|
||||||
DBG(" -> setup_system()\n");
|
DBG(" -> setup_system()\n");
|
||||||
|
|
||||||
/* Apply CPUs-specific fixups to kernel text (nop out sections
|
/* Apply the CPUs-specific and firmware specific fixups to kernel
|
||||||
* not relevant to this CPU)
|
* text (nop out sections not relevant to this CPU or this firmware)
|
||||||
*/
|
*/
|
||||||
do_feature_fixups(cur_cpu_spec->cpu_features,
|
do_feature_fixups(cur_cpu_spec->cpu_features,
|
||||||
&__start___ftr_fixup, &__stop___ftr_fixup);
|
&__start___ftr_fixup, &__stop___ftr_fixup);
|
||||||
|
do_feature_fixups(powerpc_firmware_features,
|
||||||
|
&__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Unflatten the device-tree passed by prom_init or kexec
|
* Unflatten the device-tree passed by prom_init or kexec
|
||||||
|
@ -392,12 +394,6 @@ void __init setup_system(void)
|
||||||
if (ppc_md.init_early)
|
if (ppc_md.init_early)
|
||||||
ppc_md.init_early();
|
ppc_md.init_early();
|
||||||
|
|
||||||
/* Apply firmware specific fixups to kernel text (nop out
|
|
||||||
* sections not relevant to this firmware)
|
|
||||||
*/
|
|
||||||
do_feature_fixups(powerpc_firmware_features,
|
|
||||||
&__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We can discover serial ports now since the above did setup the
|
* We can discover serial ports now since the above did setup the
|
||||||
* hash table management for us, thus ioremap works. We do that early
|
* hash table management for us, thus ioremap works. We do that early
|
||||||
|
|
Reference in a new issue