From: Tony Luck <tony.luck@intel.com>
Date: Thu, 17 Apr 2008 17:14:51 +0000 (-0700)
Subject: Pull miscellaneous into release branch
X-Git-Tag: v2.6.26-rc1~1146^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b264f85ff50c14fe945ffff06ae0d5e9a9124e;p=linux-2.6

Pull miscellaneous into release branch

Conflicts:

	arch/ia64/kernel/mca.c
---

71b264f85ff50c14fe945ffff06ae0d5e9a9124e
diff --cc arch/ia64/kernel/mca.c
index 607006a6a9,1ae5129108..e51bced3b0
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@@ -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__);