summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-02-24 13:58:15 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2012-02-24 10:39:27 -0800
commitb893485db994b17402524d3d700b950294cb6c97 (patch)
treefd0c4d145f2cac9bff903ac5ff9ac6f26d759982
parentd66acc39c7cee323733c8503b9de1821a56dff7e (diff)
downloadop-kernel-dev-b893485db994b17402524d3d700b950294cb6c97.zip
op-kernel-dev-b893485db994b17402524d3d700b950294cb6c97.tar.gz
bitops: Add missing parentheses to new get_order macro
The new get_order macro introcuded in commit d66acc39c7cee323733c8503b9de1821a56dff7e does not use parentheses around all uses of the parameter n. This causes new compile warnings, for example in the amd_iommu_init.c function: drivers/iommu/amd_iommu_init.c:561:6: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses] drivers/iommu/amd_iommu_init.c:561:6: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses] Fix those warnings by adding the missing parentheses. Reported-by: Ingo Molnar <mingo@elte.hu> Cc: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Link: http://lkml.kernel.org/r/1330088295-28732-1-git-send-email-joerg.roedel@amd.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--include/asm-generic/getorder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index e0fb4bf..65e4468 100644
--- a/include/asm-generic/getorder.h
+++ b/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) \
OpenPOWER on IntegriCloud