[patch 2.6.8-rc1] IA64_MCA_DEBUG_INFO

[patch 2.6.8-rc1] IA64_MCA_DEBUG_INFO

[Keith Owens]

Am I the only person that builds with IA64_MCA_DEBUG_INFO?

Signed-off-by: Keith Owens <kaos@sgi.com>

Note: The first hunk is already in ia64 bk, but not in Linus's bk.

Index: 2.6.8-rc1-pristine/arch/ia64/kernel/mca.c
=================================--- 2.6.8-rc1-pristine.orig/arch/ia64/kernel/mca.c	Mon Jul 12 09:22:22 2004
+++ 2.6.8-rc1-pristine/arch/ia64/kernel/mca.c	Mon Jul 12 12:48:52 2004
@@ -247,7 +247,9 @@ ia64_mca_log_sal_error_record(int sal_in
 	u8 *buffer;
 	u64 size;
 	int irq_safe = sal_info_type != SAL_INFO_TYPE_MCA && sal_info_type != SAL_INFO_TYPE_INIT;
+#ifdef	IA64_MCA_DEBUG_INFO
 	static const char * const rec_name[] = { "MCA", "INIT", "CMC", "CPE" };
+#endif
 
 	size = ia64_log_get(sal_info_type, &buffer, irq_safe);
 	if (!size)
@@ -596,7 +598,7 @@ ia64_mca_cmc_vector_disable (void *dummy
 	cmcv = (cmcv_reg_t)ia64_getreg(_IA64_REG_CR_CMCV);
 
 	cmcv.cmcv_mask = 1; /* Mask/disable interrupt */
-	ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval)
+	ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval);
 
 	IA64_MCA_DEBUG("%s: CPU %d corrected "
 		       "machine check vector %#x disabled.\n",
@@ -623,7 +625,7 @@ ia64_mca_cmc_vector_enable (void *dummy)
 	cmcv = (cmcv_reg_t)ia64_getreg(_IA64_REG_CR_CMCV);
 
 	cmcv.cmcv_mask = 0; /* Unmask/enable interrupt */
-	ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval)
+	ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval);
 
 	IA64_MCA_DEBUG("%s: CPU %d corrected "
 		       "machine check vector %#x enabled.\n",

Re: [patch 2.6.8-rc1] IA64_MCA_DEBUG_INFO

[David Mosberger]

>>>>> On Mon, 12 Jul 2004 12:56:58 +1000, Keith Owens <kaos@sgi.com> said:

  Keith> Am I the only person that builds with IA64_MCA_DEBUG_INFO?

Probably?

  Keith> Note: The first hunk is already in ia64 bk, but not in
  Keith> Linus's bk.

I applied this now (sans first hunk).  In the future, please always
include a suitable changelog (even if it's short; it saves time and
avoids confusion/mistakes if I don't have to dream up one myself).

	--david

Re: [patch 2.6.8-rc1] IA64_MCA_DEBUG_INFO

[Keith Owens]

On Mon, 12 Jul 2004 13:29:25 -0700, 
David Mosberger <davidm@napali.hpl.hp.com> wrote:
>>>>>> On Mon, 12 Jul 2004 12:56:58 +1000, Keith Owens <kaos@sgi.com> said:
>
>  Keith> Am I the only person that builds with IA64_MCA_DEBUG_INFO?
>
>Probably?
>
>  Keith> Note: The first hunk is already in ia64 bk, but not in
>  Keith> Linus's bk.
>
>I applied this now (sans first hunk).  In the future, please always
>include a suitable changelog (even if it's short; it saves time and
>avoids confusion/mistakes if I don't have to dream up one myself).

The comment "Am I the only person that builds with
IA64_MCA_DEBUG_INFO?" was a tongue in cheek changelog ...

Re: [patch 2.6.8-rc1] IA64_MCA_DEBUG_INFO

[David Mosberger]

>>>>> On Tue, 13 Jul 2004 07:12:44 +1000, Keith Owens <kaos@sgi.com> said:

  Keith> The comment "Am I the only person that builds with
  Keith> IA64_MCA_DEBUG_INFO?" was a tongue in cheek changelog ...

I obviously missed that...

	--david