| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1359995033-30225-1-git-send-email-sjenning@linux.vnet.ibm.com> Date: Mon, 4 Feb 2013 10:23:53 -0600 From: Seth Jennings <sjenning@...ux.vnet.ibm.com> To: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Seth Jennings <sjenning@...ux.vnet.ibm.com>, Andrew Morton <akpm@...ux-foundation.org>, Dan Magenheimer <dan.magenheimer@...cle.com>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, Nitin Gupta <ngupta@...are.org>, Minchan Kim <minchan@...nel.org>, Robert Jennings <rcj@...ux.vnet.ibm.com>, linux-mm@...ck.org, devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org Subject: [PATCH] staging: zsmalloc: replace local MAX() with max() This patch removes the local define MAX() macro with the kernel-wide max() macro from kernel.h Reported-by: Andrew Morton <akpm@...ux-foundation.org> Signed-off-by: Seth Jennings <sjenning@...ux.vnet.ibm.com> --- Based on greg/staging-next drivers/staging/zsmalloc/zsmalloc-main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c index 06f73a9..fd63b67 100644 --- a/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/drivers/staging/zsmalloc/zsmalloc-main.c @@ -122,10 +122,9 @@ #define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS) #define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) -#define MAX(a, b) ((a) >= (b) ? (a) : (b)) /* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ #define ZS_MIN_ALLOC_SIZE \ - MAX(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> OBJ_INDEX_BITS)) + max(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> OBJ_INDEX_BITS)) #define ZS_MAX_ALLOC_SIZE PAGE_SIZE /* -- 1.8.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists