Merge branch 'devel'

* devel: (33 commits)
  edac i5000, i5400: fix pointer math in i5000_get_mc_regs()
  edac: allow specifying the error count with fake_inject
  edac: add support for Calxeda highbank L2 cache ecc
  edac: add support for Calxeda highbank memory controller
  edac: create top-level debugfs directory
  sb_edac: properly handle error count
  i7core_edac: properly handle error count
  edac: edac_mc_handle_error(): add an error_count parameter
  edac: remove arch-specific parameter for the error handler
  amd64_edac: Don't pass driver name as an error parameter
  edac_mc: check for allocation failure in edac_mc_alloc()
  edac: Increase version to 3.0.0
  edac_mc: Cleanup per-dimm_info debug messages
  edac: Convert debugfX to edac_dbg(X,
  edac: Use more normal debugging macro style
  edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs
  Edac: Add ABI Documentation for the new device nodes
  edac: move documentation ABI to ABI/testing/sysfs-devices-edac
  i7core_edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  ...

1 files changed, 17 insertions, 22 deletions

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 117490d4f835..23bb99fa44f1 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -71,26 +71,21 @@ extern const char *edac_mem_types[];
 #ifdef CONFIG_EDAC_DEBUG
 extern int edac_debug_level;
 
-#define edac_debug_printk(level, fmt, arg...)                           \
-        do {                                                            \
-                if (level <= edac_debug_level)                          \
-                        edac_printk(KERN_DEBUG, EDAC_DEBUG,             \
-                                    "%s: " fmt, __func__, ##arg);       \
-        } while (0)
-
-#define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
-#define debugf1( ... ) edac_debug_printk(1, __VA_ARGS__ )
-#define debugf2( ... ) edac_debug_printk(2, __VA_ARGS__ )
-#define debugf3( ... ) edac_debug_printk(3, __VA_ARGS__ )
-#define debugf4( ... ) edac_debug_printk(4, __VA_ARGS__ )
+#define edac_dbg(level, fmt, ...)                                       \
+do {                                                                    \
+        if (level <= edac_debug_level)                                  \
+                edac_printk(KERN_DEBUG, EDAC_DEBUG,                     \
+                            "%s: " fmt, __func__, ##__VA_ARGS__);       \
+} while (0)
 
 #else                           /* !CONFIG_EDAC_DEBUG */
 
-#define debugf0( ... )
-#define debugf1( ... )
-#define debugf2( ... )
-#define debugf3( ... )
-#define debugf4( ... )
+#define edac_dbg(level, fmt, ...)                                       \
+do {                                                                    \
+        if (0)                                                          \
+                edac_printk(KERN_DEBUG, EDAC_DEBUG,                     \
+                            "%s: " fmt, __func__, ##__VA_ARGS__);       \
+} while (0)
 
 #endif                          /* !CONFIG_EDAC_DEBUG */
 
@@ -460,15 +455,15 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
                                       unsigned long page);
 void edac_mc_handle_error(const enum hw_event_mc_err_type type,
                           struct mem_ctl_info *mci,
+                          const u16 error_count,
                           const unsigned long page_frame_number,
                           const unsigned long offset_in_page,
                           const unsigned long syndrome,
-                          const int layer0,
-                          const int layer1,
-                          const int layer2,
+                          const int top_layer,
+                          const int mid_layer,
+                          const int low_layer,
                           const char *msg,
-                          const char *other_detail,
-                          const void *mcelog);
+                          const char *other_detail);
 
 /*
  * edac_device APIs