x86: Reduce per cpu MCA boot up messages
authorMike Travis <travis@sgi.com>
Fri, 5 Mar 2010 19:10:36 +0000 (13:10 -0600)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Mar 2010 13:27:46 +0000 (14:27 +0100)
Don't write per cpu MCA boot up messages.

Signed-of-by: Mike Travis <travis@sgi.com>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: x86@kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/mcheck/mce_intel.c

index 7c785634af2b495682565db7ecf86c2452d5edb5..d15df6e49bf02936be5f51854040efbf7a7e89cf 100644 (file)
@@ -95,7 +95,7 @@ static void cmci_discover(int banks, int boot)
 
                /* Already owned by someone else? */
                if (val & CMCI_EN) {
-                       if (test_and_clear_bit(i, owned) || boot)
+                       if (test_and_clear_bit(i, owned) && !boot)
                                print_update("SHD", &hdr, i);
                        __clear_bit(i, __get_cpu_var(mce_poll_banks));
                        continue;
@@ -107,7 +107,7 @@ static void cmci_discover(int banks, int boot)
 
                /* Did the enable bit stick? -- the bank supports CMCI */
                if (val & CMCI_EN) {
-                       if (!test_and_set_bit(i, owned) || boot)
+                       if (!test_and_set_bit(i, owned) && !boot)
                                print_update("CMCI", &hdr, i);
                        __clear_bit(i, __get_cpu_var(mce_poll_banks));
                } else {