]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Pull miscellaneous into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
Conflicts:

arch/ia64/kernel/mca.c

1  2 
arch/ia64/Kconfig
arch/ia64/kernel/asm-offsets.c
arch/ia64/kernel/fsys.S
arch/ia64/kernel/mca.c
arch/ia64/kernel/setup.c
arch/ia64/mm/discontig.c

Simple merge
Simple merge
Simple merge
index 607006a6a976750d4b050b3032b77d52940ad946,1ae512910870da963c3cfe6fe9695dd443bf821d..e51bced3b0fad2b6bbbb050cc0ac828ba6b68c15
@@@ -1311,15 -1268,8 +1313,13 @@@ ia64_mca_handler(struct pt_regs *regs, 
        } else {
                /* Dump buffered message to console */
                ia64_mlogbuf_finish(1);
- #ifdef CONFIG_KEXEC
-               atomic_set(&kdump_in_progress, 1);
-               monarch_cpu = -1;
- #endif
        }
 +      if (__get_cpu_var(ia64_mca_tr_reload)) {
 +              mca_insert_tr(0x1); /*Reload dynamic itrs*/
 +              mca_insert_tr(0x2); /*Reload dynamic itrs*/
 +      }
++
        if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
                        == NOTIFY_STOP)
                ia64_mca_spin(__func__);
Simple merge
Simple merge