Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / arch / ppc64 / kernel / chrp_setup.c

diff --git a/arch/ppc64/kernel/chrp_setup.c b/arch/ppc64/kernel/chrp_setup.c
index 123c889..bb8ca7f 100644 (file)
--- a/arch/ppc64/kernel/chrp_setup.c
+++ b/arch/ppc64/kernel/chrp_setup.c
@@ -189,7 +189,7 @@ chrp_init2(void)
  */
 void __init fwnmi_init(void)
 {
-       long ret;
+       int ret;
        int ibm_nmi_register = rtas_token("ibm,nmi-register");
        if (ibm_nmi_register == RTAS_UNKNOWN_SERVICE)
                return;
@@ -243,6 +243,8 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
                ppc_md.get_irq        = xics_get_irq;
        }
 
+       ppc_md.log_error      = pSeries_log_error;
+
        ppc_md.init           = chrp_init2;
 
        ppc_md.pcibios_fixup  = pSeries_final_fixup;