* [PATCH] ppc bug.h namespace pollution
@ 2005-11-01 15:17 Al Viro
2005-11-02 2:45 ` Paul Mackerras
0 siblings, 1 reply; 4+ messages in thread
From: Al Viro @ 2005-11-01 15:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, linux-kernel
DATA_TYPE is really not a good thing to put into header that
gets included all over the tree...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC14-base/include/asm-powerpc/bug.h current/include/asm-powerpc/bug.h
--- RC14-base/include/asm-powerpc/bug.h 2005-11-01 02:39:50.000000000 -0500
+++ current/include/asm-powerpc/bug.h 2005-11-01 04:50:01.000000000 -0500
@@ -15,12 +15,12 @@
#define BUG_TABLE_ENTRY(label, line, file, func) \
".llong " #label "\n .long " #line "\n .llong " #file ", " #func "\n"
#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"
-#define DATA_TYPE long long
+#define BUG_DATA_TYPE long long
#else
#define BUG_TABLE_ENTRY(label, line, file, func) \
".long " #label ", " #line ", " #file ", " #func "\n"
#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n"
-#define DATA_TYPE int
+#define BUG_DATA_TYPE int
#endif /* __powerpc64__ */
struct bug_entry {
@@ -55,7 +55,7 @@
".section __bug_table,\"a\"\n\t" \
BUG_TABLE_ENTRY(1b,%1,%2,%3) \
".previous" \
- : : "r" ((DATA_TYPE)(x)), "i" (__LINE__), \
+ : : "r" ((BUG_DATA_TYPE)(x)), "i" (__LINE__), \
"i" (__FILE__), "i" (__FUNCTION__)); \
} while (0)
@@ -65,7 +65,7 @@
".section __bug_table,\"a\"\n\t" \
BUG_TABLE_ENTRY(1b,%1,%2,%3) \
".previous" \
- : : "r" ((DATA_TYPE)(x)), \
+ : : "r" ((BUG_DATA_TYPE)(x)), \
"i" (__LINE__ + BUG_WARNING_TRAP), \
"i" (__FILE__), "i" (__FUNCTION__)); \
} while (0)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ppc bug.h namespace pollution
2005-11-01 15:17 [PATCH] ppc bug.h namespace pollution Al Viro
@ 2005-11-02 2:45 ` Paul Mackerras
2005-11-02 3:10 ` Al Viro
0 siblings, 1 reply; 4+ messages in thread
From: Paul Mackerras @ 2005-11-02 2:45 UTC (permalink / raw)
To: Al Viro; +Cc: linuxppc-dev, Linus Torvalds, linux-kernel
Al Viro writes:
> DATA_TYPE is really not a good thing to put into header that
> gets included all over the tree...
Very true. However, I don't see any reason why the cast shouldn't
just be (long) on both 32-bit and 64-bit, so we can get rid of that
define altogether.
Paul.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ppc bug.h namespace pollution
2005-11-02 2:45 ` Paul Mackerras
@ 2005-11-02 3:10 ` Al Viro
2005-11-02 3:29 ` Paul Mackerras
0 siblings, 1 reply; 4+ messages in thread
From: Al Viro @ 2005-11-02 3:10 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, Linus Torvalds, linux-kernel
On Wed, Nov 02, 2005 at 01:45:58PM +1100, Paul Mackerras wrote:
> Al Viro writes:
>
> > DATA_TYPE is really not a good thing to put into header that
> > gets included all over the tree...
>
> Very true. However, I don't see any reason why the cast shouldn't
> just be (long) on both 32-bit and 64-bit, so we can get rid of that
> define altogether.
Should be OK...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC14-base/include/asm-powerpc/bug.h current/include/asm-powerpc/bug.h
--- RC14-base/include/asm-powerpc/bug.h 2005-11-01 22:08:35.000000000 -0500
+++ current/include/asm-powerpc/bug.h 2005-11-01 22:09:28.000000000 -0500
@@ -15,12 +15,10 @@
#define BUG_TABLE_ENTRY(label, line, file, func) \
".llong " #label "\n .long " #line "\n .llong " #file ", " #func "\n"
#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"
-#define DATA_TYPE long long
#else
#define BUG_TABLE_ENTRY(label, line, file, func) \
".long " #label ", " #line ", " #file ", " #func "\n"
#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n"
-#define DATA_TYPE int
#endif /* __powerpc64__ */
struct bug_entry {
@@ -55,7 +53,7 @@
".section __bug_table,\"a\"\n\t" \
BUG_TABLE_ENTRY(1b,%1,%2,%3) \
".previous" \
- : : "r" ((DATA_TYPE)(x)), "i" (__LINE__), \
+ : : "r" ((long)(x)), "i" (__LINE__), \
"i" (__FILE__), "i" (__FUNCTION__)); \
} while (0)
@@ -65,7 +63,7 @@
".section __bug_table,\"a\"\n\t" \
BUG_TABLE_ENTRY(1b,%1,%2,%3) \
".previous" \
- : : "r" ((DATA_TYPE)(x)), \
+ : : "r" ((long)(x)), \
"i" (__LINE__ + BUG_WARNING_TRAP), \
"i" (__FILE__), "i" (__FUNCTION__)); \
} while (0)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-11-02 3:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-01 15:17 [PATCH] ppc bug.h namespace pollution Al Viro
2005-11-02 2:45 ` Paul Mackerras
2005-11-02 3:10 ` Al Viro
2005-11-02 3:29 ` Paul Mackerras
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).