From: Fengguang Wu <fengguang.wu@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Glauber Costa <glommer@parallels.com>,
kernel-janitors@vger.kernel.org,
Linux Memory Management List <linux-mm@kvack.org>
Subject: [PATCH] idr: Rename MAX_LEVEL to MAX_ID_LEVEL
Date: Mon, 10 Sep 2012 21:14:26 +0800 [thread overview]
Message-ID: <20120910131426.GA12431@localhost> (raw)
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>
next reply other threads:[~2012-09-10 13:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 13:14 Fengguang Wu [this message]
2012-09-10 14:07 ` [PATCH] idr: Rename MAX_LEVEL to MAX_ID_LEVEL 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120910131426.GA12431@localhost \
--to=fengguang.wu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=glommer@parallels.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).