ras-events: Fix MCE binding

The #ifdef for detecting MCE was wrong. Due to that, the MCE
handler was not being enabled.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/ras-events.c b/ras-events.c
index 837af584e956e2dc98eb2597cee8d9815516d2e2..f97a62e337c0451ed7398df930e77fa2a32844b6 100644 (file)
--- a/ras-events.c
+++ b/ras-events.c
@@ -29,6 +29,7 @@
 #include "libtrace/event-parse.h"
 #include "ras-mc-handler.h"
 #include "ras-aer-handler.h"
+#include "ras-mce-handler.h"
 #include "ras-record.h"
 #include "ras-logger.h"
 
@@ -194,7 +195,7 @@ int toggle_ras_mc_event(int enable)
        rc |= __toggle_ras_mc_event(ras, "ras", "aer_event", enable);
 #endif
 
-#ifdef HAVE_MCE_HANDLER
+#ifdef HAVE_MCE
        rc |= __toggle_ras_mc_event(ras, "mce", "mce_record", enable);
 #endif
 
@@ -547,14 +548,13 @@ int handle_ras_events(int record_events)
                goto err;
 #endif
 
-#ifdef HAVE_MCE_HANDLER
+#ifdef HAVE_MCE
        rc = register_mce_handler(ras);
        if (rc) {
                log(SYSLOG, LOG_INFO, "Can't register mce handler\n");
-               free(page);
                goto err;
        }
-       if (ras->mce) {
+       if (ras->mce_priv) {
                rc = add_event_handler(ras, pevent, page_size,
                                       "mce", "mce_record",
                                       ras_mce_event_handler);

diff --git a/ras-events.h b/ras-events.h
index f29970b656c4ba92b2fcf26ddc086381d8abbfd9..554a95e69727b441aef06c5769785f6c1af1e1cd 100644 (file)
--- a/ras-events.h
+++ b/ras-events.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "ras-record.h"
-
 #ifndef __RAS_EVENTS_H
 #define __RAS_EVENTS_H
 
+#include "ras-record.h"
+
 #include <pthread.h>
 #include <time.h>
 

diff --git a/ras-mce-handler.h b/ras-mce-handler.h
index 127c1cdad93d3aa567d38487f5ab4b3642a1b414..dd29921ed5e2aae891b4a73fa3af98d2b6bb6744 100644 (file)
--- a/ras-mce-handler.h
+++ b/ras-mce-handler.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef __RAS_AER_HANDLER_H
-#define __RAS_AER_HANDLER_H
+#ifndef __RAS_MCE_HANDLER_H
+#define __RAS_MCE_HANDLER_H
 
 #include <stdint.h>