Define ABS() library function. Use it.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c
index 4acbf7447a47a753e75695313c997b211f3fb774..2402984f1efcb6608ed10b209e9595e7c02a59f4 100644 (file)
--- a/xen/common/compat/memory.c
+++ b/xen/common/compat/memory.c
@@ -116,7 +116,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat)
 
             start_extent = cmp.xchg.nr_exchanged;
             end_extent = (COMPAT_ARG_XLAT_SIZE - sizeof(*nat.xchg)) /
-                         (((1U << __builtin_abs(order_delta)) + 1) *
+                         (((1U << ABS(order_delta)) + 1) *
                           sizeof(*space));
             if ( end_extent == 0 )
             {

diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 45fc60f857a333e3c27af0c6db080b74e55cf050..e09929a604d798cf1bc8bd1213db71980963cf9e 100644 (file)
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -40,6 +40,11 @@ do {                                                            \
 #define ASSERT(p) ((void)0)
 #endif
 
+#define ABS(_x) ({                              \
+    typeof(_x) __x = (_x);                      \
+    (__x < 0) ? -__x : __x;                     \
+})
+
 #define SWAP(_a, _b) \
    do { typeof(_a) _t = (_a); (_a) = (_b); (_b) = _t; } while ( 0 )