Changes in kernel/generic/include/macros.h [33ca0f5:933cadf] in mainline

File:

• kernel/generic/include/macros.h (modified) (1 diff)

kernel/generic/include/macros.h

@@ -69 +69 @@
     uint64_t sz2)
 {
-        uint64_t e1;
-        uint64_t e2;
-
-        /* Handle the two corner cases when either sz1 or sz2 are zero. */
-        if (sz1 == 0)
-                return (s1 == s2) && (sz2 == 0);
-        e1 = s1 + sz1 - 1;      
-        if (sz2 == 0)
-                return (s1 <= s2) && (s2 <= e1);
-        e2 = s2 + sz2 - 1;
-
-        /* e1 and e2 are end addresses, the sum is imune to overflow */
+        uint64_t e1 = s1 + sz1;
+        uint64_t e2 = s2 + sz2;
+        
         return ((s1 <= s2) && (e1 >= e2));
 }
 
 #endif /* __ASM__ */
-
-#define ispwr2(x)       (((x) & ((x) - 1)) == 0)
 
 #define isdigit(d)     (((d) >= '0') && ((d) <= '9'))