diff --git a/[refs] b/[refs] index d1aeb5937610..5d6bea772c0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d66acc39c7cee323733c8503b9de1821a56dff7e +refs/heads/master: b893485db994b17402524d3d700b950294cb6c97 diff --git a/trunk/include/asm-generic/getorder.h b/trunk/include/asm-generic/getorder.h index e0fb4bf9f160..65e4468ac53d 100644 --- a/trunk/include/asm-generic/getorder.h +++ b/trunk/include/asm-generic/getorder.h @@ -49,8 +49,8 @@ int __get_order(unsigned long size) #define get_order(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 0UL) ? BITS_PER_LONG - PAGE_SHIFT : \ - ((n < (1UL << PAGE_SHIFT)) ? 0 : \ + ((n) == 0UL) ? BITS_PER_LONG - PAGE_SHIFT : \ + (((n) < (1UL << PAGE_SHIFT)) ? 0 : \ ilog2((n) - 1) - PAGE_SHIFT + 1) \ ) : \ __get_order(n) \