From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Clean up namespace in kmap_types.h
Date: Wed, 3 Dec 2008 01:36:20 +0100 [thread overview]
Message-ID: <20081203003620.GA32069@basil.nowhere.org> (raw)
Clean up namespace in kmap_types.h
During debugging I often use custom "D" macros. But I ran
into a name space conflict with kmap_types.h which also defines a D macro.
Rename the kmap_types.h one to KMAPD.
No semantical changes.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/include/asm/kmap_types.h | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
Index: linux-2.6.28-rc4-test/arch/x86/include/asm/kmap_types.h
===================================================================
--- linux-2.6.28-rc4-test.orig/arch/x86/include/asm/kmap_types.h 2008-10-24 13:34:40.000000000 +0200
+++ linux-2.6.28-rc4-test/arch/x86/include/asm/kmap_types.h 2008-12-02 22:51:16.000000000 +0100
@@ -2,28 +2,28 @@
#define _ASM_X86_KMAP_TYPES_H
#if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM)
-# define D(n) __KM_FENCE_##n ,
+# define KMAPD(n) __KM_FENCE_##n ,
#else
-# define D(n)
+# define KMAPD(n)
#endif
enum km_type {
-D(0) KM_BOUNCE_READ,
-D(1) KM_SKB_SUNRPC_DATA,
-D(2) KM_SKB_DATA_SOFTIRQ,
-D(3) KM_USER0,
-D(4) KM_USER1,
-D(5) KM_BIO_SRC_IRQ,
-D(6) KM_BIO_DST_IRQ,
-D(7) KM_PTE0,
-D(8) KM_PTE1,
-D(9) KM_IRQ0,
-D(10) KM_IRQ1,
-D(11) KM_SOFTIRQ0,
-D(12) KM_SOFTIRQ1,
-D(13) KM_TYPE_NR
+KMAPD(0) KM_BOUNCE_READ,
+KMAPD(1) KM_SKB_SUNRPC_DATA,
+KMAPD(2) KM_SKB_DATA_SOFTIRQ,
+KMAPD(3) KM_USER0,
+KMAPD(4) KM_USER1,
+KMAPD(5) KM_BIO_SRC_IRQ,
+KMAPD(6) KM_BIO_DST_IRQ,
+KMAPD(7) KM_PTE0,
+KMAPD(8) KM_PTE1,
+KMAPD(9) KM_IRQ0,
+KMAPD(10) KM_IRQ1,
+KMAPD(11) KM_SOFTIRQ0,
+KMAPD(12) KM_SOFTIRQ1,
+KMAPD(13) KM_TYPE_NR
};
-#undef D
+#undef KMAPD
#endif /* _ASM_X86_KMAP_TYPES_H */
next reply other threads:[~2008-12-03 0:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-03 0:36 Andi Kleen [this message]
2008-12-03 10:40 ` [PATCH] Clean up namespace in kmap_types.h Arnd Bergmann
2008-12-03 11:20 ` Andi Kleen
2008-12-03 12:13 ` Arnd Bergmann
2008-12-03 12:01 ` New location for generic headers? Sam Ravnborg
2008-12-03 12:19 ` Andi Kleen
2008-12-03 12:21 ` Christoph Hellwig
2008-12-03 12:42 ` Andi Kleen
2008-12-03 12:37 ` Christoph Hellwig
2008-12-03 12:26 ` Arnd Bergmann
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=20081203003620.GA32069@basil.nowhere.org \
--to=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.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