3 files changed, 40 insertions, 25 deletions

diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index 37c88eb55873..ca6666b51ccb 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -62,6 +62,11 @@ typedef enum {
         ISOLATE_NONE
 } isolate_status_t;
 
+typedef enum {
+        MCA_NOT_RECOVERED = 0,
+        MCA_RECOVERED     = 1
+} recovery_status_t;
+
 /*
  *  This pool keeps pointers to the section part of SAL error record
  */
@@ -71,6 +76,18 @@ static struct {
         int          max_idx; /* Maximum index of section pointer list pool */
 } slidx_pool;
 
+static int
+fatal_mca(const char *fmt, ...)
+{
+        va_list args;
+
+        va_start(args, fmt);
+        vprintk(fmt, args);
+        va_end(args);
+
+        return MCA_NOT_RECOVERED;
+}
+
 /**
  * mca_page_isolate - isolate a poisoned page in order not to use it later
  * @paddr:      poisoned memory location
@@ -424,7 +441,7 @@ recover_from_read_error(slidx_table_t *slidx,
 
         /* Is target address valid? */
         if (!pbci->tv)
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: target address not valid\n");
 
         /*
          * cpu read or memory-mapped io read
@@ -442,7 +459,7 @@ recover_from_read_error(slidx_table_t *slidx,
 
         /* Is minstate valid? */
         if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate))
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: minstate not valid\n");
         psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr);
         psr2 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_xpsr);
 
@@ -476,12 +493,13 @@ recover_from_read_error(slidx_table_t *slidx,
                         psr2->bn  = 1;
                         psr2->i  = 0;
 
-                        return 1;
+                        return MCA_RECOVERED;
                 }
 
         }
 
-        return 0;
+        return fatal_mca(KERN_ALERT "MCA: kernel context not recovered,"
+                          " iip 0x%lx\n", pmsa->pmsa_iip);
 }
 
 /**
@@ -567,13 +585,13 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
          * The machine check is corrected.
          */
         if (psp->cm == 1)
-                return 1;
+                return MCA_RECOVERED;
 
         /*
          * The error was not contained.  Software must be reset.
          */
         if (psp->us || psp->ci == 0)
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: error not contained\n");
 
         /*
          * The cache check and bus check bits have four possible states
@@ -584,20 +602,22 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
          *    1  1      Memory error, attempt recovery
          */
         if (psp->bc == 0 || pbci == NULL)
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: No bus check\n");
 
         /*
          * Sorry, we cannot handle so many.
          */
         if (peidx_bus_check_num(peidx) > 1)
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: Too many bus checks\n");
         /*
          * Well, here is only one bus error.
          */
-        if (pbci->ib || pbci->cc)
-                return 0;
+        if (pbci->ib)
+                return fatal_mca(KERN_ALERT "MCA: Internal Bus error\n");
+        if (pbci->cc)
+                return fatal_mca(KERN_ALERT "MCA: Cache-cache error\n");
         if (pbci->eb && pbci->bsi > 0)
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: External bus check fatal status\n");
 
         /*
          * This is a local MCA and estimated as recoverble external bus error.
@@ -609,7 +629,7 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
         /*
          * On account of strange SAL error record, we cannot recover.
          */
-        return 0;
+        return fatal_mca(KERN_ALERT "MCA: Strange SAL record\n");
 }
 
 /**
@@ -638,12 +658,10 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos)
 
          /* Now, OS can recover when there is one processor error section */
         if (n_proc_err > 1)
-                return 0;
-        else if (n_proc_err == 0) {
+                return fatal_mca(KERN_ALERT "MCA: Too Many Errors\n");
+        else if (n_proc_err == 0)
                 /* Weird SAL record ... We need not to recover */
-
-                return 1;
-        }
+                return fatal_mca(KERN_ALERT "MCA: Weird SAL record\n");
 
         /* Make index of processor error section */
         mca_make_peidx((sal_log_processor_info_t*)
@@ -654,7 +672,7 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos)
 
         /* Check whether MCA is global or not */
         if (is_mca_global(&peidx, &pbci, sos))
-                return 0;
+                return fatal_mca(KERN_ALERT "MCA: global MCA\n");
         
         /* Try to recover a processor error */
         return recover_from_processor_error(platform_err, &slidx, &peidx,
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 9887c8787e7a..e61e15e28d8b 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3,
                         arch = AUDIT_ARCH_IA64;
                 }
 
-                audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3);
+                audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);
         }
 
 }
@@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3,
 
                 if (success != AUDITSC_SUCCESS)
                         result = -result;
-                audit_syscall_exit(current, success, result);
+                audit_syscall_exit(success, result);
         }
 
         if (test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 7da4739f536e..4f3a16b37f8f 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -305,13 +305,10 @@ static struct kobj_type cache_ktype_percpu_entry = {
 
 static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu)
 {
-        if (all_cpu_cache_info[cpu].cache_leaves) {
-                kfree(all_cpu_cache_info[cpu].cache_leaves);
-                all_cpu_cache_info[cpu].cache_leaves = NULL;
-        }
+        kfree(all_cpu_cache_info[cpu].cache_leaves);
+        all_cpu_cache_info[cpu].cache_leaves = NULL;
         all_cpu_cache_info[cpu].num_cache_leaves = 0;
         memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject));
-
         return;
 }