* [PATCH] staging: zsmalloc: replace local MAX() with max()
@ 2013-02-04 16:23 Seth Jennings
2013-02-04 16:28 ` Seth Jennings
0 siblings, 1 reply; 2+ messages in thread
From: Seth Jennings @ 2013-02-04 16:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Seth Jennings, Andrew Morton, Dan Magenheimer,
Konrad Rzeszutek Wilk, Nitin Gupta, Minchan Kim, Robert Jennings,
linux-mm, devel, linux-kernel
This patch removes the local define MAX() macro with the
kernel-wide max() macro from kernel.h
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Seth Jennings <sjenning@linux.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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: zsmalloc: replace local MAX() with max()
2013-02-04 16:23 [PATCH] staging: zsmalloc: replace local MAX() with max() Seth Jennings
@ 2013-02-04 16:28 ` Seth Jennings
0 siblings, 0 replies; 2+ messages in thread
From: Seth Jennings @ 2013-02-04 16:28 UTC (permalink / raw)
To: Seth Jennings
Cc: Greg Kroah-Hartman, Andrew Morton, Dan Magenheimer,
Konrad Rzeszutek Wilk, Nitin Gupta, Minchan Kim, Robert Jennings,
linux-mm, devel, linux-kernel
Greg,
Please disregard, didn't mean to send this out, it doesn't compile :-/
Thanks,
Seth
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-04 16:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-04 16:23 [PATCH] staging: zsmalloc: replace local MAX() with max() Seth Jennings
2013-02-04 16:28 ` Seth Jennings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).