diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 14:39:08 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 14:39:08 +0000 |
| commit | 74293759002aa7db0179158c20676a034614577b (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /arch/ia64/kernel/mca_drv.c | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
| download | blackbird-op-linux-74293759002aa7db0179158c20676a034614577b.tar.gz blackbird-op-linux-74293759002aa7db0179158c20676a034614577b.zip | |
Merge branch 'master' of /home/aia21/ntfs-2.6/
Diffstat (limited to 'arch/ia64/kernel/mca_drv.c')
| -rw-r--r-- | arch/ia64/kernel/mca_drv.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index 8fd93afa75a7..e883d85906db 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c @@ -123,8 +123,9 @@ mca_page_isolate(unsigned long paddr) void mca_handler_bh(unsigned long paddr) { - printk(KERN_DEBUG "OS_MCA: process [pid: %d](%s) encounters MCA.\n", - current->pid, current->comm); + printk(KERN_ERR + "OS_MCA: process [pid: %d](%s) encounters MCA (paddr=%lx)\n", + current->pid, current->comm, paddr); spin_lock(&mca_bh_lock); switch (mca_page_isolate(paddr)) { @@ -132,7 +133,7 @@ mca_handler_bh(unsigned long paddr) printk(KERN_DEBUG "Page isolation: ( %lx ) success.\n", paddr); break; case ISOLATE_NG: - printk(KERN_DEBUG "Page isolation: ( %lx ) failure.\n", paddr); + printk(KERN_CRIT "Page isolation: ( %lx ) failure.\n", paddr); break; default: break; @@ -567,10 +568,15 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, return 0; /* - * If there is no bus error, record is weird but we need not to recover. + * The cache check and bus check bits have four possible states + * cc bc + * 0 0 Weird record, not recovered + * 1 0 Cache error, not recovered + * 0 1 I/O error, attempt recovery + * 1 1 Memory error, attempt recovery */ if (psp->bc == 0 || pbci == NULL) - return 1; + return 0; /* * Sorry, we cannot handle so many. |
