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

Commit 826ea8f2 authored by Tony Breeds's avatar Tony Breeds Committed by Linus Torvalds
Browse files

Revert "[POWERPC] Do firmware feature fixups after features are initialised" 



This reverts commit 5a26f6bb.

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: default avatarTony Breeds <tony@bakeyournoodle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4f3731da

arch/powerpc/kernel/setup_64.c

+4 −8
Original line number Diff line number Diff line
@@ -350,11 +350,13 @@ void __init setup_system(void) 
{

	DBG(" -> setup_system()\n");



	/* Apply CPUs-specific fixups to kernel text (nop out sections

	 * not relevant to this CPU)

	/* Apply the CPUs-specific and firmware specific fixups to kernel

	 * text (nop out sections not relevant to this CPU or this firmware)

	 */

	do_feature_fixups(cur_cpu_spec->cpu_features,

			  &__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
@@ -392,12 +394,6 @@ void __init setup_system(void) 
	if (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

	 * hash table management for us, thus ioremap works. We do that early