diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2007-07-18 02:17:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 13:17:39 -0400 |
commit | 826ea8f22cf612d534f33c492c98f7895043bfd1 (patch) | |
tree | 23e859f2efb5f1fca758b800a76d8fd7d5626e78 /arch/powerpc/kernel/setup_64.c | |
parent | 4f3731da16678026a564b1d7ae218131e4af6810 (diff) |
Revert "[POWERPC] Do firmware feature fixups after features are initialised"
This reverts commit 5a26f6bbb767d7ad23311a1e81cfdd2bebefb855.
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>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index bc43bba05cf8..6018178708a5 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -350,11 +350,13 @@ void __init setup_system(void) | |||
350 | { | 350 | { |
351 | DBG(" -> setup_system()\n"); | 351 | DBG(" -> setup_system()\n"); |
352 | 352 | ||
353 | /* Apply CPUs-specific fixups to kernel text (nop out sections | 353 | /* Apply the CPUs-specific and firmware specific fixups to kernel |
354 | * not relevant to this CPU) | 354 | * text (nop out sections not relevant to this CPU or this firmware) |
355 | */ | 355 | */ |
356 | do_feature_fixups(cur_cpu_spec->cpu_features, | 356 | do_feature_fixups(cur_cpu_spec->cpu_features, |
357 | &__start___ftr_fixup, &__stop___ftr_fixup); | 357 | &__start___ftr_fixup, &__stop___ftr_fixup); |
358 | do_feature_fixups(powerpc_firmware_features, | ||
359 | &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup); | ||
358 | 360 | ||
359 | /* | 361 | /* |
360 | * Unflatten the device-tree passed by prom_init or kexec | 362 | * Unflatten the device-tree passed by prom_init or kexec |
@@ -392,12 +394,6 @@ void __init setup_system(void) | |||
392 | if (ppc_md.init_early) | 394 | if (ppc_md.init_early) |
393 | ppc_md.init_early(); | 395 | ppc_md.init_early(); |
394 | 396 | ||
395 | /* Apply firmware specific fixups to kernel text (nop out | ||
396 | * sections not relevant to this firmware) | ||
397 | */ | ||
398 | do_feature_fixups(powerpc_firmware_features, | ||
399 | &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup); | ||
400 | |||
401 | /* | 397 | /* |
402 | * We can discover serial ports now since the above did setup the | 398 | * We can discover serial ports now since the above did setup the |
403 | * hash table management for us, thus ioremap works. We do that early | 399 | * hash table management for us, thus ioremap works. We do that early |