Skip to contentSkip to conversation

m68k: use the new byteorder headers

PATCH Geert Uytterhoeven 2 participants 3 messages Oct 21, 2008 – Oct 22, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1224525138.31861.206.camel@brick

#1 lore raw
Quoted 48 lines · Harvey Harrison

---
The final prerequisite patches to prevent breakage of headers-install and usage of the swabb.h functions have gone into mainline, please move your arch to the new header.

b8e465f4945bc0e9f324e3bbe15f5180a8e9a6fe byteorder: add new headers for make headers-install acf0108a84edae22b99655eb2f6f6c9f7ec4d449 byteorder: use generic C version for value byteswapping 1d8cca44b6a244b7e378546d719041819049a0f9 byteorder: provide swabb.h generically in asm/byteorder.h 1a651a00e20fd4997f0b91258f6f95b7d96edcd9 byteorder: remove direct includes of linux/byteorder/swab[b].h

 include/asm-m68k/byteorder.h |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
include/asm-m68k/byteorder.h +5 -11
index 81d420b..b354acd 100644
@@ -4,22 +4,16 @@
 #include <asm/types.h>
 #include <linux/compiler.h>
 
-#ifdef __GNUC__
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 	__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
 	return val;
 }
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 
-#endif
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68K_BYTEORDER_H */
Signature · 1 line
1.6.0.2

This patch breaks rcutorture:

|   CC [M]  kernel/rcutorture.o
| In file included from kernel/rcutorture.c:45:
| include/linux/byteorder/swabb.h:82:1: warning: "__swahw32" redefined
| In file included from include/linux/byteorder.h:5,
|                  from include2/asm/byteorder.h:17,
|                  from include/linux/kernel.h:20,
|                  from kernel/rcutorture.c:26:
| include/linux/swab.h:128:1: warning: this is the location of the previous definition
| In file included from kernel/rcutorture.c:45:
| include/linux/byteorder/swabb.h:86:1: warning: "__swahb32" redefined
| In file included from include/linux/byteorder.h:5,
|                  from include2/asm/byteorder.h:17,
|                  from include/linux/kernel.h:20,
|                  from kernel/rcutorture.c:26:
| include/linux/swab.h:139:1: warning: this is the location of the previous definition
| In file included from kernel/rcutorture.c:46:
| include/linux/byteorder/swabb.h:98: error: conflicting types for '__swahw32p'
| include/linux/swab.h:190: error: previous definition of '__swahw32p' was here
| include/linux/byteorder/swabb.h:103: error: redefinition of '__swahw32s'
| include/linux/swab.h:258: error: previous definition of '__swahw32s' was here
| include/linux/byteorder/swabb.h:113: error: conflicting types for '__swahb32p'
| include/linux/swab.h:205: error: previous definition of '__swahb32p' was here
| include/linux/byteorder/swabb.h:118: error: redefinition of '__swahb32s'
| include/linux/swab.h:273: error: previous definition of '__swahb32s' was here
| make[3]: *** [kernel/rcutorture.o] Error 1
| make[2]: *** [kernel/rcutorture.o] Error 2

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
Quoted 7 lines · Geert Uytterhoeven
Quoted 6 lines · Harvey Harrison

---
The final prerequisite patches to prevent breakage of headers-install and usage of the swabb.h functions have gone into mainline, please move your arch to the new header.

Quoted 5 lines
Quoted 5 lines

b8e465f4945bc0e9f324e3bbe15f5180a8e9a6fe byteorder: add new headers for make headers-install acf0108a84edae22b99655eb2f6f6c9f7ec4d449 byteorder: use generic C version for value byteswapping 1d8cca44b6a244b7e378546d719041819049a0f9 byteorder: provide swabb.h generically in asm/byteorder.h 1a651a00e20fd4997f0b91258f6f95b7d96edcd9 byteorder: remove direct includes of linux/byteorder/swab[b].h

A hunk got lost, see mainline:

Quoted 10 lines

commit f07767fd0f95c385108fa4c456a9cb216a424fec

Author: Harvey Harrison <[email protected]>
Date:   Mon Oct 20 10:23:38 2008 -0700

byteorder: remove direct includes of linux/byteorder/swab[b].h

A consolidated implementation will provide this generically through asm/byteorder, remove direct includes to avoid breakage when the changeover to the new implementation occurs.

Quoted 5 lines

This hunk was lost from commit 1d8cca44b6a244b7e378546d719041819049a0f9 ("byteorder: provide swabb.h generically in asm/byteorder.h")

Cheers,

Harvey

#3 lore raw
Quoted 8 lines · Harvey Harrison
Quoted 7 lines · Geert Uytterhoeven
Quoted 6 lines · Harvey Harrison

---
The final prerequisite patches to prevent breakage of headers-install and usage of the swabb.h functions have gone into mainline, please move your arch to the new header.

Quoted 23 lines
Quoted 5 lines
Quoted 5 lines

b8e465f4945bc0e9f324e3bbe15f5180a8e9a6fe byteorder: add new headers for make headers-install acf0108a84edae22b99655eb2f6f6c9f7ec4d449 byteorder: use generic C version for value byteswapping 1d8cca44b6a244b7e378546d719041819049a0f9 byteorder: provide swabb.h generically in asm/byteorder.h 1a651a00e20fd4997f0b91258f6f95b7d96edcd9 byteorder: remove direct includes of linux/byteorder/swab[b].h

A hunk got lost, see mainline:

Quoted 15 lines

commit f07767fd0f95c385108fa4c456a9cb216a424fec

Author: Harvey Harrison <[email protected]>
Date:   Mon Oct 20 10:23:38 2008 -0700

byteorder: remove direct includes of linux/byteorder/swab[b].h

A consolidated implementation will provide this generically through asm/byteorder, remove direct includes to avoid breakage when the changeover to the new implementation occurs.

This hunk was lost from commit 1d8cca44b6a244b7e378546d719041819049a0f9 ("byteorder: provide swabb.h generically in asm/byteorder.h")

Ah, my tree didn't have that one yet.
After upgrading, kernel/rcutorture.c compiles again.
I'll let you know if more breakage pops up (I expect not, as I built with `make -k' ;-).

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds