linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] idr: Rename MAX_LEVEL to MAX_ID_LEVEL
@ 2012-09-10 13:14 Fengguang Wu
  2012-09-10 14:07 ` Glauber Costa
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Fengguang Wu @ 2012-09-10 13:14 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Glauber Costa, kernel-janitors, Linux Memory Management List

To avoid name conflicts:

drivers/video/riva/fbdev.c:281:9: sparse: preprocessor token MAX_LEVEL redefined

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

Andrew: the conflict happens in Glauber's kmemcg-slab tree.  So it's
better to quickly push this pre-fix to upstream before Glauber's patches.


 include/linux/idr.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux.orig/include/linux/idr.h	2012-09-10 21:08:51.177452944 +0800
+++ linux/include/linux/idr.h	2012-09-10 21:08:57.729452732 +0800
@@ -43,10 +43,10 @@
 #define MAX_ID_MASK (MAX_ID_BIT - 1)
 
 /* Leave the possibility of an incomplete final layer */
-#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
+#define MAX_ID_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
 
 /* Number of id_layer structs to leave in free list */
-#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
+#define IDR_FREE_MAX MAX_ID_LEVEL + MAX_ID_LEVEL
 
 struct idr_layer {
 	unsigned long		 bitmap; /* A zero bit means "space here" */

--
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] 9+ messages in thread

end of thread, other threads:[~2012-09-13  9:53 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-10 13:14 [PATCH] idr: Rename MAX_LEVEL to MAX_ID_LEVEL Fengguang Wu
2012-09-10 14:07 ` Glauber Costa
2012-09-10 16:12 ` walter harms
2012-09-11  9:48   ` Fengguang Wu
2012-09-12 23:03     ` Andrew Morton
2012-09-12 23:38       ` Fengguang Wu
2012-09-13  9:50         ` Glauber Costa
2012-09-11  8:27 ` Bernd Petrovitsch
2012-09-11  9:47   ` Fengguang Wu

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).