Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5a26f6bbb767d7ad23311a1e81cfdd2bebefb855
Commit:     5a26f6bbb767d7ad23311a1e81cfdd2bebefb855
Parent:     4cefebb1b497a84d61f2fa29d497df75a84b69d4
Author:     Michael Neuling <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 8 14:00:35 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon Jun 25 17:03:26 2007 +1000

    [POWERPC] Do firmware feature fixups after features are initialised
    
    On pSeries the firmware features are not setup until ppc_md.init_early,
    so we can't do the firmware feature sections fixups till after this.
    
    Currently firmware feature sections is only used on iSeries which inits
    the firmware features much earlier.  This is a bug in waiting on
    pSeries.
    
    Signed-off-by: Michael Neuling <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/setup_64.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6018178..bc43bba 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -350,13 +350,11 @@ void __init setup_system(void)
 {
        DBG(" -> setup_system()\n");
 
-       /* Apply the CPUs-specific and firmware specific fixups to kernel
-        * text (nop out sections not relevant to this CPU or this firmware)
+       /* Apply CPUs-specific fixups to kernel text (nop out sections
+        * not relevant to this CPU)
         */
        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
@@ -394,6 +392,12 @@ 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to