1 files changed, 12 insertions, 2 deletions
diff --git a/os/kernel/include/chmemcore.h b/os/kernel/include/chmemcore.h
index f42478125..58cb318b2 100644
--- a/os/kernel/include/chmemcore.h
+++ b/os/kernel/include/chmemcore.h
@@ -36,14 +36,24 @@
 typedef void *(*memgetfunc_t)(size_t size);
 
 /**
+ * @brief   Alignment size constant.
+ */
+#define MEM_ALIGN_SIZE      sizeof(stkalign_t)
+
+/**
  * @brief   Alignment mask constant.
  */
-#define MEM_ALIGN_MASK      (sizeof(stkalign_t) - 1)
+#define MEM_ALIGN_MASK      (MEM_ALIGN_SIZE - 1)
+
+/**
+ * @brief   Alignment helper macro.
+ */
+#define MEM_ALIGN_PREV(p)   ((size_t)(p) & ~MEM_ALIGN_MASK)
 
 /**
  * @brief   Alignment helper macro.
  */
-#define MEM_ALIGN_SIZE(p)   (((size_t)(p) + MEM_ALIGN_MASK) & ~MEM_ALIGN_MASK)
+#define MEM_ALIGN_NEXT(p)   MEM_ALIGN_PREV((size_t)(p) + MEM_ALIGN_MASK)
 
 /**
  * @brief   Returns whatever a pointer or memory size is aligned to