Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 8b65570552691ad6fa2a012cf20ea6571577cd46)
+++ kernel/generic/include/macros.h	(revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c)
@@ -95,9 +95,6 @@
 	overlaps(KA2PA((x)), (szx), KA2PA((y)), (szy))
 
-#define SIZE2KB(size)  ((size) >> 10)
-#define SIZE2MB(size)  ((size) >> 20)
-
-#define KB2SIZE(kb)  ((kb) << 10)
-#define MB2SIZE(mb)  ((mb) << 20)
+#define KiB2SIZE(kb)  ((kb) << 10)
+#define MiB2SIZE(mb)  ((mb) << 20)
 
 #define STRING(arg)      STRING_ARG(arg)
Index: kernel/generic/include/str.h
===================================================================
--- kernel/generic/include/str.h	(revision 8b65570552691ad6fa2a012cf20ea6571577cd46)
+++ kernel/generic/include/str.h	(revision afdcc60e9cc75aa7bdedc29f54dc7ea32809d95c)
@@ -99,5 +99,6 @@
 extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
 
-extern void order_suffix(const uint64_t val, uint64_t *rv, char *suffix);
+extern void order_suffix(const uint64_t, uint64_t *, char *);
+extern void bin_order_suffix(const uint64_t, uint64_t *, const char **, bool);
 
 #endif