Skip to contentSkip to conversation

cris: introduce asm/swab.h

PATCH In review Harvey Harrison 2 participants 4 messages Jan 14, 2009 – Jan 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cris: introduce asm/swab.h

Adjust the arch overrides to the new names as well.

---
Jesper, I noticed that my patch was the only one for CRIS this merge window (at least looking at linux-next), I hope you're OK with me sending this directly to Linus. It's just code movement, so I'm confident it's not going to break anything.

 arch/cris/include/arch-v10/arch/byteorder.h |   26 -----------------------
 arch/cris/include/arch-v10/arch/swab.h      |   30 +++++++++++++++++++++++++++
 arch/cris/include/arch-v32/arch/byteorder.h |   20 ------------------
 arch/cris/include/arch-v32/arch/swab.h      |   24 +++++++++++++++++++++
 arch/cris/include/asm/Kbuild                |    1 +
 arch/cris/include/asm/byteorder.h           |   20 +-----------------
 arch/cris/include/asm/swab.h                |    8 +++++++
 7 files changed, 64 insertions(+), 65 deletions(-)
arch/cris/include/arch-v10/arch/byteorder.h deleted +0 -26
deleted file mode 100644
index 255b646..0000000
@@ -1,26 +0,0 @@
-#ifndef _CRIS_ARCH_BYTEORDER_H
-#define _CRIS_ARCH_BYTEORDER_H
-
-#include <asm/types.h>
-#include <linux/compiler.h>
-
-/* we just define these two (as we can do the swap in a single
- * asm instruction in CRIS) and the arch-independent files will put
- * them together into ntohl etc.
- */
-
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-{
-	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
-  
-	return(x);
-}
-
-static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
-{
-	__asm__ ("swapb %0" : "=r" (x) : "0" (x));
-	
-	return(x);
-}
-
-#endif
arch/cris/include/arch-v10/arch/swab.h new file +30 -0
new file mode 100644
index 0000000..e4e847d
@@ -0,0 +1,30 @@
+#ifndef _CRIS_ARCH_SWAB_H
+#define _CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>
+#include <linux/compiler.h>
+
+#define __SWAB_64_THRU_32__
+
+/* we just define these two (as we can do the swap in a single
+ * asm instruction in CRIS) and the arch-independent files will put
+ * them together into ntohl etc.
+ */
+
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
+{
+	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
+
+	return(x);
+}
+#define __arch_swab32 __arch_swab32
+
+static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
+{
+	__asm__ ("swapb %0" : "=r" (x) : "0" (x));
+
+	return(x);
+}
+#define __arch_swab16 __arch_swab16
+
+#endif
arch/cris/include/arch-v32/arch/byteorder.h deleted +0 -20
deleted file mode 100644
index 6ef8fb4..0000000
@@ -1,20 +0,0 @@
-#ifndef _ASM_CRIS_ARCH_BYTEORDER_H
-#define _ASM_CRIS_ARCH_BYTEORDER_H
-
-#include <asm/types.h>
-
-static inline __const__ __u32
-___arch__swab32(__u32 x)
-{
-	__asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x));
-	return (x);
-}
-
-static inline __const__ __u16
-___arch__swab16(__u16 x)
-{
-	__asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x));
-	return (x);
-}
-
-#endif /* _ASM_CRIS_ARCH_BYTEORDER_H */
arch/cris/include/arch-v32/arch/swab.h new file +24 -0
new file mode 100644
index 0000000..1152329
@@ -0,0 +1,24 @@
+#ifndef _ASM_CRIS_ARCH_SWAB_H
+#define _ASM_CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>
+
+#define __SWAB_64_THRU_32__
+
+static inline __const__ __u32
+__arch_swab32(__u32 x)
+{
+	__asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x));
+	return (x);
+}
+#define __arch_swab32 __arch_swab32
+
+static inline __const__ __u16
+__arch_swab16(__u16 x)
+{
+	__asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x));
+	return (x);
+}
+#define __arch_swab32 __arch_swab32
+
+#endif /* _ASM_CRIS_ARCH_SWAB_H */
arch/cris/include/asm/Kbuild +1 -0
index d5b6319..b79b7c6 100644
@@ -9,3 +9,4 @@ header-y += sync_serial.h
 
 unifdef-y += etraxgpio.h
 unifdef-y += rs485.h
+unifdef-y += swab.h
arch/cris/include/asm/byteorder.h +1 -19
index cc8e418..7678d86 100644
@@ -1,25 +1,7 @@
 #ifndef _CRIS_BYTEORDER_H
 #define _CRIS_BYTEORDER_H
 
-#ifdef __GNUC__
-
-#ifdef __KERNEL__
-#include <arch/byteorder.h>
-
-/* defines are necessary because the other files detect the presence
- * of a defined __arch_swab32, not an inline
- */
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-#endif /* __KERNEL__ */
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* __GNUC__ */
-
+#include <asm/swab.h>
 #include <linux/byteorder/little_endian.h>
 
 #endif
arch/cris/include/asm/swab.h new file +8 -0
new file mode 100644
index 0000000..80668e8
@@ -0,0 +1,8 @@
+#ifndef _CRIS_SWAB_H
+#define _CRIS_SWAB_H
+
+#ifdef __KERNEL__
+#include <arch/swab.h>
+#endif /* __KERNEL__ */
+
+#endif /* _CRIS_SWAB_H */
Signature · 1 line
1.6.1.212.g4b3ec
#1 lore raw

Adjust the arch overrides to the new names as well.

---
Sorry, _this_ is the one that won't break anything. Previous patch was incorrect in the defines in arch-v32/swab.h

 arch/cris/include/arch-v10/arch/byteorder.h |   26 -----------------------
 arch/cris/include/arch-v10/arch/swab.h      |   30 +++++++++++++++++++++++++++
 arch/cris/include/arch-v32/arch/byteorder.h |   20 ------------------
 arch/cris/include/arch-v32/arch/swab.h      |   24 +++++++++++++++++++++
 arch/cris/include/asm/Kbuild                |    1 +
 arch/cris/include/asm/byteorder.h           |   20 +-----------------
 arch/cris/include/asm/swab.h                |    8 +++++++
 7 files changed, 64 insertions(+), 65 deletions(-)
arch/cris/include/arch-v10/arch/byteorder.h deleted +0 -26
deleted file mode 100644
index 255b646..0000000
@@ -1,26 +0,0 @@
-#ifndef _CRIS_ARCH_BYTEORDER_H
-#define _CRIS_ARCH_BYTEORDER_H
-
-#include <asm/types.h>
-#include <linux/compiler.h>
-
-/* we just define these two (as we can do the swap in a single
- * asm instruction in CRIS) and the arch-independent files will put
- * them together into ntohl etc.
- */
-
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-{
-	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
-  
-	return(x);
-}
-
-static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
-{
-	__asm__ ("swapb %0" : "=r" (x) : "0" (x));
-	
-	return(x);
-}
-
-#endif
arch/cris/include/arch-v10/arch/swab.h new file +30 -0
new file mode 100644
index 0000000..e4e847d
@@ -0,0 +1,30 @@
+#ifndef _CRIS_ARCH_SWAB_H
+#define _CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>
+#include <linux/compiler.h>
+
+#define __SWAB_64_THRU_32__
+
+/* we just define these two (as we can do the swap in a single
+ * asm instruction in CRIS) and the arch-independent files will put
+ * them together into ntohl etc.
+ */
+
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
+{
+	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
+
+	return(x);
+}
+#define __arch_swab32 __arch_swab32
+
+static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
+{
+	__asm__ ("swapb %0" : "=r" (x) : "0" (x));
+
+	return(x);
+}
+#define __arch_swab16 __arch_swab16
+
+#endif
arch/cris/include/arch-v32/arch/byteorder.h deleted +0 -20
deleted file mode 100644
index 6ef8fb4..0000000
@@ -1,20 +0,0 @@
-#ifndef _ASM_CRIS_ARCH_BYTEORDER_H
-#define _ASM_CRIS_ARCH_BYTEORDER_H
-
-#include <asm/types.h>
-
-static inline __const__ __u32
-___arch__swab32(__u32 x)
-{
-	__asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x));
-	return (x);
-}
-
-static inline __const__ __u16
-___arch__swab16(__u16 x)
-{
-	__asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x));
-	return (x);
-}
-
-#endif /* _ASM_CRIS_ARCH_BYTEORDER_H */
arch/cris/include/arch-v32/arch/swab.h new file +24 -0
new file mode 100644
index 0000000..9a4ea5e
@@ -0,0 +1,24 @@
+#ifndef _ASM_CRIS_ARCH_SWAB_H
+#define _ASM_CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>
+
+#define __SWAB_64_THRU_32__
+
+static inline __const__ __u32
+__arch_swab32(__u32 x)
+{
+	__asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x));
+	return (x);
+}
+#define __arch_swab32 __arch_swab32
+
+static inline __const__ __u16
+__arch_swab16(__u16 x)
+{
+	__asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x));
+	return (x);
+}
+#define __arch_swab16 __arch_swab16
+
+#endif /* _ASM_CRIS_ARCH_SWAB_H */
arch/cris/include/asm/Kbuild +1 -0
index d5b6319..b79b7c6 100644
@@ -9,3 +9,4 @@ header-y += sync_serial.h
 
 unifdef-y += etraxgpio.h
 unifdef-y += rs485.h
+unifdef-y += swab.h
arch/cris/include/asm/byteorder.h +1 -19
index cc8e418..7678d86 100644
@@ -1,25 +1,7 @@
 #ifndef _CRIS_BYTEORDER_H
 #define _CRIS_BYTEORDER_H
 
-#ifdef __GNUC__
-
-#ifdef __KERNEL__
-#include <arch/byteorder.h>
-
-/* defines are necessary because the other files detect the presence
- * of a defined __arch_swab32, not an inline
- */
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-#endif /* __KERNEL__ */
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* __GNUC__ */
-
+#include <asm/swab.h>
 #include <linux/byteorder/little_endian.h>
 
 #endif
arch/cris/include/asm/swab.h new file +8 -0
new file mode 100644
index 0000000..80668e8
@@ -0,0 +1,8 @@
+#ifndef _CRIS_SWAB_H
+#define _CRIS_SWAB_H
+
+#ifdef __KERNEL__
+#include <arch/swab.h>
+#endif /* __KERNEL__ */
+
+#endif /* _CRIS_SWAB_H */
Signature · 1 line
1.6.1.212.g4b3ec
#2 lore raw
In reply to Harvey Harrison
Quoted 24 lines · Harvey Harrison

Adjust the arch overrides to the new names as well.

---
Jesper, I noticed that my patch was the only one for CRIS this merge window (at least looking at linux-next), I hope you're OK with me sending this directly to Linus. It's just code movement, so I'm confident it's not going to break anything.

 arch/cris/include/arch-v10/arch/byteorder.h |   26 -----------------------
 arch/cris/include/arch-v10/arch/swab.h      |   30 +++++++++++++++++++++++++++
 arch/cris/include/arch-v32/arch/byteorder.h |   20 ------------------
 arch/cris/include/arch-v32/arch/swab.h      |   24 +++++++++++++++++++++
 arch/cris/include/asm/Kbuild                |    1 +
 arch/cris/include/asm/byteorder.h           |   20 +-----------------
 arch/cris/include/asm/swab.h                |    8 +++++++
 7 files changed, 64 insertions(+), 65 deletions(-)
arch/cris/include/arch-v10/arch/swab.h new file +0 -0
new file mode 100644
index 0000000..e4e847d

arch/cris/include/arch-v10/arch/swab.h line 4

Quoted 4 lines
arch/cris/include/arch-v10/arch/swab.h new file +4 -0
@@ -0,0 +1,30 @@
+#ifndef _CRIS_ARCH_SWAB_H
+#define _CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>

Please replace #include <asm/types.h> with #include <linux/types.h> otherwise you will get following 'make headers_check' warnings:
usr/include/asm/swab.h:4: include of <linux/types.h> is preferred
over <asm/types.h>
usr/include/asm/swab.h:14: found __[us]{8,16,32,64} type without
#include <linux/types.h>

arch/cris/include/arch-v32/arch/swab.h line 4

Quoted 10 lines
arch/cris/include/arch-v32/arch/swab.h new file +4 -0
new file mode 100644
index 0000000..1152329
@@ -0,0 +1,24 @@
+#ifndef _ASM_CRIS_ARCH_SWAB_H
+#define _ASM_CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>

ditto.

If possible, please also fix your other patches which are in queue.

--
JSR

#3 lore raw
Quoted 4 lines · Jaswinder Singh Rajput
Quoted 2 lines · Harvey Harrison

Adjust the arch overrides to the new names as well.

Quoted 15 lines

arch/cris/include/arch-v10/arch/swab.h line 4

Quoted 7 lines
arch/cris/include/arch-v10/arch/swab.h new file +4 -0
@@ -0,0 +1,30 @@
+#ifndef _CRIS_ARCH_SWAB_H
+#define _CRIS_ARCH_SWAB_H
+
+#include <asm/types.h>

Please replace #include <asm/types.h> with #include <linux/types.h> otherwise you will get following 'make headers_check' warnings:
usr/include/asm/swab.h:4: include of <linux/types.h> is preferred
over <asm/types.h>
usr/include/asm/swab.h:14: found __[us]{8,16,32,64} type without
#include <linux/types.h>

1) I sent this patch bypassing the arch maintainer, so I made it as simple as possible, just moved the byteorder.h's and changed the names of the arch-overrides.

2) If you'd care to check, this file is not exported to userspace, so I can't possible trigger that warning.

3) It's already in Linus' tree, so it's a bit hard for me to change it now ;-)

Harvey