From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 11 Aug 2010 15:43:44 +0000 (+0100)
Subject: Define ABS() library function. Use it.
X-Git-Tag: 4.0.1-rc6~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6007502b5726d833d15d06c231f4a46f001da3ca;p=xen.git

Define ABS() library function. Use it.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset:   21345:2077d6ad6078
xen-unstable date:        Tue May 11 11:19:23 2010 +0100
---

diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c
index 4acbf7447a..2402984f1e 100644
--- 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 bca0d65df0..d21e8dd5c0 100644
--- 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 )