kernel: Move arches to use common unaligned access

PATCH In review Harvey Harrison 4 participants 9 messages Apr 11, 2008 Generic include/asm header files

lore

Share & tools

lore

Harvey Harrison

author

2008-04-11 03:38 UTC #0 lore raw

PATCH 2/2 kernel: Move arches to use common unaligned access

Unaligned access is ok for the following arches:
cris, m68k, mn10300, powerpc, s390, x86

Arches that use the no-builtin-memcpy implementation:
h8300, m32r, xtensa

generic_le:
alpha, blackfin, ia64,

generic_be:
parisc, sparc, sparc64

generic_le or be, choice based on compiler flags:
mips, sh

m86knommu is generic_be for Coldfire, otherwise unaligned access is ok.

frv uses the no_builtin_memcpy implementation when there is an MMU configured, otherwise uses the generic be byteshifting version.

arm chooses endianness based on compiler settings, uses the byteshifting versions.

v850 is le, uses the byteshifting versions for both be and le.

Remove the now unused asm-generic implementation.

Signed-off-by Harvey Harrison <[email protected]>

---
David, this version uses the generic C versions, but if your testing finds the handrolled frv versions were better as we've been discussing, I will restore them.

 include/asm-alpha/unaligned.h     |    2 +-
 include/asm-arm/unaligned.h       |  166 +---------------------------------
 include/asm-avr32/unaligned.h     |    2 +-
 include/asm-blackfin/unaligned.h  |    2 +-
 include/asm-cris/unaligned.h      |    8 +--
 include/asm-frv/unaligned.h       |  184 ++-----------------------------------
 include/asm-generic/unaligned.h   |  124 -------------------------
 include/asm-h8300/unaligned.h     |   11 +--
 include/asm-ia64/unaligned.h      |    2 +-
 include/asm-m32r/unaligned.h      |   15 +---
 include/asm-m68k/unaligned.h      |    9 +--
 include/asm-m68knommu/unaligned.h |   10 +--
 include/asm-mips/unaligned.h      |   29 ++----
 include/asm-mn10300/unaligned.h   |  126 +-------------------------
 include/asm-parisc/unaligned.h    |    2 +-
 include/asm-powerpc/unaligned.h   |    9 +--
 include/asm-s390/unaligned.h      |    9 +--
 include/asm-sh/unaligned.h        |    6 +-
 include/asm-sparc/unaligned.h     |    2 +-
 include/asm-sparc64/unaligned.h   |    2 +-
 include/asm-v850/unaligned.h      |  111 +----------------------
 include/asm-x86/unaligned.h       |   30 +------
 include/asm-xtensa/unaligned.h    |   12 +--
 23 files changed, 48 insertions(+), 825 deletions(-)

include/asm-alpha/unaligned.h +1 -1

index a1d7284..18acc19 100644
@@ -1,6 +1,6 @@
 #ifndef __ALPHA_UNALIGNED_H
 #define __ALPHA_UNALIGNED_H
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
 #endif

include/asm-arm/unaligned.h +1 ~~-165~~

172 lines not on this page · raw message

include/asm-avr32/unaligned.h +1 -1

index 36f5fd4..28fa20e 100644
@@ -11,6 +11,6 @@
  * optimize word loads in general.
  */
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #endif /* __ASM_AVR32_UNALIGNED_H */

include/asm-blackfin/unaligned.h +1 -1

index 10081dc..25861cd 100644
@@ -1,6 +1,6 @@
 #ifndef __BFIN_UNALIGNED_H
 #define __BFIN_UNALIGNED_H
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
 #endif				/* __BFIN_UNALIGNED_H */

include/asm-cris/unaligned.h +1 -7

index 7fbbb39..8bd3555 100644
@@ -3,14 +3,8 @@
 
 /*
  * CRIS can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
 
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif

include/asm-frv/unaligned.h +9 ~~-175~~

202 lines not on this page · raw message

include/asm-generic/unaligned.h deleted +0 ~~-124~~

124 lines not on this page · raw message

include/asm-h8300/unaligned.h +1 ~~-10~~

index ffb67f4..e8ff49d 100644
@@ -1,15 +1,6 @@
 #ifndef __H8300_UNALIGNED_H
 #define __H8300_UNALIGNED_H
 
-
-/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
+#include <linux/unaligned/no_builtin_memcpy.h>
 
 #endif

include/asm-ia64/unaligned.h +1 -1

index bb85598..2134205 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_IA64_UNALIGNED_H
 #define _ASM_IA64_UNALIGNED_H
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
 #endif /* _ASM_IA64_UNALIGNED_H */

include/asm-m32r/unaligned.h +1 ~~-14~~

index fccc180..5a4c931 100644
@@ -1,19 +1,6 @@
 #ifndef _ASM_M32R_UNALIGNED_H
 #define _ASM_M32R_UNALIGNED_H
 
-/*
- * For the benefit of those who are trying to port Linux to another
- * architecture, here are some C-language equivalents.
- */
-
-#include <asm/string.h>
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
+#include <linux/unaligned/no_builtin_memcpy.h>
 
 #endif /* _ASM_M32R_UNALIGNED_H */

include/asm-m68k/unaligned.h +1 -8

index 804cb3f..94b4a77 100644
@@ -3,14 +3,7 @@
 
 /*
  * The m68k can do unaligned accesses itself.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif

include/asm-m68knommu/unaligned.h +2 -8

index 869e9dd..6b5c7a2 100644
@@ -4,19 +4,13 @@
 
 #ifdef CONFIG_COLDFIRE
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #else
 /*
  * The m68k can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif

include/asm-mips/unaligned.h +10 ~~-19~~

index 3249049..471e127 100644
@@ -5,25 +5,16 @@
  *
  * Copyright (C) 2007 Ralf Baechle (ralf-6z/[email protected])
  */
-#ifndef __ASM_GENERIC_UNALIGNED_H
-#define __ASM_GENERIC_UNALIGNED_H
+#ifndef __ASM_MIPS_UNALIGNED_H
+#define __ASM_MIPS_UNALIGNED_H
 
 #include <linux/compiler.h>
+#if defined(__MIPSEB__)
+#  include <linux/unaligned/generic_be.h>
+#elif defined(__MIPSEL__)
+#  include <linux/unaligned/generic_le.h>
+#else
+#  error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
+#endif
 
-#define get_unaligned(ptr)					\
-({								\
-	struct __packed {					\
-		typeof(*(ptr)) __v;				\
-	} *__p = (void *) (ptr);				\
-	__p->__v;						\
-})
-
-#define put_unaligned(val, ptr)					\
-do {								\
-	struct __packed {					\
-		typeof(*(ptr)) __v;				\
-	} *__p = (void *) (ptr);				\
-	__p->__v = (val);					\
-} while(0)
-
-#endif /* __ASM_GENERIC_UNALIGNED_H */
+#endif /* __ASM_MIPS_UNALIGNED_H */

include/asm-mn10300/unaligned.h +3 ~~-123~~

132 lines not on this page · raw message

include/asm-parisc/unaligned.h +1 -1

index 53c9058..865867c 100644
@@ -1,7 +1,7 @@
 #ifndef _ASM_PARISC_UNALIGNED_H_
 #define _ASM_PARISC_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #ifdef __KERNEL__
 struct pt_regs;

include/asm-powerpc/unaligned.h +1 -8

index 6c95dfa..59bcc21 100644
@@ -5,15 +5,8 @@
 
 /*
  * The PowerPC can do unaligned accesses itself in big endian mode.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_UNALIGNED_H */

include/asm-s390/unaligned.h +1 -8

index 8ee86db..1d4a684 100644
@@ -11,14 +11,7 @@
 
 /*
  * The S390 can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif

include/asm-sh/unaligned.h +5 -1

index 5250e30..391da8d 100644
@@ -2,6 +2,10 @@
 #define __ASM_SH_UNALIGNED_H
 
 /* SH can't handle unaligned accesses. */
-#include <asm-generic/unaligned.h>
+#ifdef __LITTLE_ENDIAN__
+#include <linux/unaligned/generic_le.h>
+#else
+#include <linux/unaligned/generic_be.h>
+#endif
 
 #endif /* __ASM_SH_UNALIGNED_H */

include/asm-sparc/unaligned.h +1 -1

index b6f8edd..9f1bb56 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_SPARC_UNALIGNED_H_
 #define _ASM_SPARC_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #endif /* _ASM_SPARC_UNALIGNED_H */

include/asm-sparc64/unaligned.h +1 -1

index 1ed3ba5..faa18cd 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_SPARC64_UNALIGNED_H_
 #define _ASM_SPARC64_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #endif /* _ASM_SPARC64_UNALIGNED_H */

include/asm-v850/unaligned.h +3 ~~-108~~

117 lines not on this page · raw message

include/asm-x86/unaligned.h +1 ~~-29~~

index 913598d..7ba2e1a 100644
@@ -3,35 +3,7 @@
 
 /*
  * The x86 can do unaligned accesses itself.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-/**
- * get_unaligned - get value from possibly mis-aligned location
- * @ptr: pointer to value
- *
- * This macro should be used for accessing values larger in size than
- * single bytes at locations that are expected to be improperly aligned,
- * e.g. retrieving a u16 value from a location not u16-aligned.
- *
- * Note that unaligned accesses can be very expensive on some architectures.
- */
-#define get_unaligned(ptr) (*(ptr))
-
-/**
- * put_unaligned - put value to a possibly mis-aligned location
- * @val: value to place
- * @ptr: pointer to location
- *
- * This macro should be used for placing values larger in size than
- * single bytes at locations that are expected to be improperly aligned,
- * e.g. writing a u16 value to a location not u16-aligned.
- *
- * Note that unaligned accesses can be very expensive on some architectures.
- */
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif /* _ASM_X86_UNALIGNED_H */

include/asm-xtensa/unaligned.h +1 ~~-11~~

index 2822089..45eb203 100644
@@ -13,16 +13,6 @@
 #ifndef _XTENSA_UNALIGNED_H
 #define _XTENSA_UNALIGNED_H
 
-#include <linux/string.h>
-
-/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
+#include <linux/unaligned/no_builtin_memcpy.h>
 
 #endif	/* _XTENSA_UNALIGNED_H */

Signature · 1 line

1.5.5.144.g3e42

Ingo Molnar

Acked-by on v1 2/2

2008-04-11 07:48 UTC #1 lore raw

include/asm-x86/unaligned.h

Quoted 4 lines · Harvey Harrison

include/asm-x86/unaligned.h +0 -0
index 913598d..7ba2e1a 100644

nice work - the x86 bits and the general concept:

Acked-by Ingo Molnar <[email protected]>

Ingo

David Howells

2008-04-11 10:11 UTC #2 lore raw

In reply to Harvey Harrison

include/asm-frv/unaligned.h line 13

Quoted 5 lines · Harvey Harrison

include/asm-frv/unaligned.h +2 -3

-#ifndef _ASM_UNALIGNED_H
-#define _ASM_UNALIGNED_H
-
+#ifndef _ASM_FRV_UNALIGNED_H_
+#define _ASM_FRV_UNALIGNED_H_

Why?

Quoted 2 lines

- * impractical. So, now we fall back to using memcpy.
+ * impractical. So, now we fall back to using memmov.

That's memmove, not memmov. Any why memmove, not memcpy? Is __tmp likely to overlap with *ptr?

Also, for FRV, I think calling memmove/memcpy for MMU kernels may be the wrong thing to do... I'm sort of leaning towards doing the same thing as NOMMU kernels and just using your inline ones.

The advantage of the inline ones is that they are quicker and probably involve fewer instructions executed; whereas using memcpy/memmove may end up with smaller, but slower code. Hmmm... Maybe key on CONFIG_CC_OPTIMIZE_FOR_SIZE?

David

David Miller

2008-04-11 10:16 UTC #3 lore raw

From: David Howells <[email protected]>
Date: Fri, 11 Apr 2008 11:11:28 +0100

Quoted 7 lines

Quoted 2 lines · Harvey Harrison
- * impractical. So, now we fall back to using memcpy.
+ * impractical. So, now we fall back to using memmov.
That's memmove, not memmov. Any why memmove, not memcpy? Is __tmp likely to overlap with *ptr?

No, I think it has something to do with what cases GCC is allowed to optimize the call inline and what cases it cannot wrt. alignment of datums.

David Howells

2008-04-11 10:27 UTC #4 lore raw

Quoted 3 lines · David Miller

No, I think it has something to do with what cases GCC is allowed to optimize the call inline and what cases it cannot wrt. alignment of datums.

As he says in his comment, in fact.

David

Harvey Harrison

author

2008-04-11 15:19 UTC #5 lore raw

In reply to David Howells

Quoted 9 lines · David Howells

include/asm-frv/unaligned.h line 13
Quoted 5 lines · Harvey Harrison
include/asm-frv/unaligned.h +2 -3
-#ifndef _ASM_UNALIGNED_H
-#define _ASM_UNALIGNED_H
-
+#ifndef _ASM_FRV_UNALIGNED_H_
+#define _ASM_FRV_UNALIGNED_H_
Why?

Consistency with every other arch..no other reason.

Quoted 10 lines

Quoted 3 lines
- * impractical. So, now we fall back to using memcpy.
+ * impractical. So, now we fall back to using memmov.
That's memmove, not memmov. Any why memmove, not memcpy? Is __tmp likely to overlap with *ptr?
Also, for FRV, I think calling memmove/memcpy for MMU kernels may be the wrong thing to do... I'm sort of leaning towards doing the same thing as NOMMU kernels and just using your inline ones.

OK, just let me know what you decide. I'm stil open to bringing back the frv asm versions if the do end up being faster.

Quoted 5 lines

The advantage of the inline ones is that they are quicker and probably involve fewer instructions executed; whereas using memcpy/memmove may end up with smaller, but slower code. Hmmm... Maybe key on CONFIG_CC_OPTIMIZE_FOR_SIZE?

I suppose an out-of-line version could be easily added to accomplish this. It would be identical to the byteshifting implementation-wise.

Let me know if you'd like me to spin such a patch.

Harvey

David Howells

2008-04-11 15:50 UTC #6 lore raw

Quoted 1 line · Harvey Harrison

Consistency with every other arch..no other reason.

But not M68K(NOMMU), Alpha, Blackfin, Cris, H8300, MN10300, ..., but generally consistent with the other FRV headers (some other people have added differ).

Hmmm... It looks like MIPS is weird. That says __ASM_GENERIC_UNALIGNED_H, which is probably wrong.

David

Harvey Harrison

author

2008-04-11 17:31 UTC #7 lore raw

Quoted 11 lines · David Howells

Quoted 1 line · Harvey Harrison
Consistency with every other arch..no other reason.
But not M68K(NOMMU), Alpha, Blackfin, Cris, H8300, MN10300, ..., but generally consistent with the other FRV headers (some other people have added differ).
Hmmm... It looks like MIPS is weird. That says __ASM_GENERIC_UNALIGNED_H, which is probably wrong.
David

Well, now's the time to decide on something as I'm changing every arch.

What is the general pattern used for this kind of thing? Or am I just asking what color to paint this bikeshed?

Harvey

Harvey Harrison

author

2008-04-11 17:55 UTC #8 lore raw

In reply to David Howells

Unaligned access is ok for the following arches:
cris, m68k, mn10300, powerpc, s390, x86

Arches that use the no-builtin-memcpy implementation:
h8300, m32r, xtensa

generic_le:
alpha, blackfin, ia64,

generic_be:
parisc, sparc, sparc64

generic_le or be, choice based on compiler flags:
mips, sh

m86knommu is generic_be for Coldfire, otherwise unaligned access is ok.

frv uses the no_builtin_memcpy implementation when there is an MMU configured, otherwise uses the generic be byteshifting version.

arm chooses endianness based on compiler settings, uses the byteshifting versions.

v850 is le, uses the byteshifting versions for both be and le.

Remove the now unused asm-generic implementation.

[revised: standardize #ifdef testing across arches _ASM_ARCH_UNALIGNED_H_ ]

Signed-off-by Harvey Harrison <[email protected]>

---
 include/asm-alpha/unaligned.h     |    8 +-
 include/asm-arm/unaligned.h       |  172 +---------------------------------
 include/asm-avr32/unaligned.h     |    8 +-
 include/asm-blackfin/unaligned.h  |    8 +-
 include/asm-cris/unaligned.h      |   14 +--
 include/asm-frv/unaligned.h       |  184 ++-----------------------------------
 include/asm-generic/unaligned.h   |  124 -------------------------
 include/asm-h8300/unaligned.h     |   17 +---
 include/asm-ia64/unaligned.h      |    8 +-
 include/asm-m32r/unaligned.h      |   21 +----
 include/asm-m68k/unaligned.h      |   15 +--
 include/asm-m68knommu/unaligned.h |   16 +--
 include/asm-mips/unaligned.h      |   29 ++----
 include/asm-mn10300/unaligned.h   |  128 +-------------------------
 include/asm-parisc/unaligned.h    |    2 +-
 include/asm-powerpc/unaligned.h   |   15 +--
 include/asm-s390/unaligned.h      |   15 +--
 include/asm-sh/unaligned.h        |   12 ++-
 include/asm-sparc/unaligned.h     |    4 +-
 include/asm-sparc64/unaligned.h   |    4 +-
 include/asm-um/unaligned.h        |    6 +-
 include/asm-v850/unaligned.h      |  117 +----------------------
 include/asm-x86/unaligned.h       |   36 +-------
 include/asm-xtensa/unaligned.h    |   18 +---
 24 files changed, 102 insertions(+), 879 deletions(-)

include/asm-alpha/unaligned.h +4 -4

index a1d7284..2e241f7 100644
@@ -1,6 +1,6 @@
-#ifndef __ALPHA_UNALIGNED_H
-#define __ALPHA_UNALIGNED_H
+#ifndef _ASM_ALPHA_UNALIGNED_H_
+#define _ASM_ALPHA_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
-#endif
+#endif /* _ASM_ALPHA_UNALIGNED_H_ */

include/asm-arm/unaligned.h +4 ~~-168~~

179 lines not on this page · raw message

include/asm-avr32/unaligned.h +4 -4

index 36f5fd4..5008d9b 100644
@@ -1,5 +1,5 @@
-#ifndef __ASM_AVR32_UNALIGNED_H
-#define __ASM_AVR32_UNALIGNED_H
+#ifndef _ASM_AVR32_UNALIGNED_H_
+#define _ASM_AVR32_UNALIGNED_H_
 
 /*
  * AVR32 can handle some unaligned accesses, depending on the

@@ -11,6 +11,6 @@
  * optimize word loads in general.
  */
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
-#endif /* __ASM_AVR32_UNALIGNED_H */
+#endif /* _ASM_AVR32_UNALIGNED_H_ */

include/asm-blackfin/unaligned.h +4 -4

index 10081dc..3328e24 100644
@@ -1,6 +1,6 @@
-#ifndef __BFIN_UNALIGNED_H
-#define __BFIN_UNALIGNED_H
+#ifndef _ASM_BLACKFIN_UNALIGNED_H_
+#define _ASM_BLACKFIN_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
-#endif				/* __BFIN_UNALIGNED_H */
+#endif /* _ASM_BLACKFIN_UNALIGNED_H_ */

include/asm-cris/unaligned.h +4 ~~-10~~

index 7fbbb39..daa1b91 100644
@@ -1,16 +1,10 @@
-#ifndef __CRIS_UNALIGNED_H
-#define __CRIS_UNALIGNED_H
+#ifndef _ASM_CRIS_UNALIGNED_H_
+#define _ASM_CRIS_UNALIGNED_H_
 
 /*
  * CRIS can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
 
-#define get_unaligned(ptr) (*(ptr))
+#include <linux/unaligned/access_ok.h>
 
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-
-#endif
+#endif /* _ASM_CRIS_UNALIGNED_H_ */

include/asm-frv/unaligned.h +9 ~~-175~~

202 lines not on this page · raw message

include/asm-generic/unaligned.h deleted +0 ~~-124~~

124 lines not on this page · raw message

include/asm-h8300/unaligned.h +4 ~~-13~~

index ffb67f4..f32b266 100644
@@ -1,15 +1,6 @@
-#ifndef __H8300_UNALIGNED_H
-#define __H8300_UNALIGNED_H
+#ifndef _ASM_H8300_UNALIGNED_H_
+#define _ASM_H8300_UNALIGNED_H_
 
+#include <linux/unaligned/no_builtin_memcpy.h>
 
-/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
-
-#endif
+#endif /* _ASM_H8300_UNALIGNED_H_ */

include/asm-ia64/unaligned.h +4 -4

index bb85598..451768e 100644
@@ -1,6 +1,6 @@
-#ifndef _ASM_IA64_UNALIGNED_H
-#define _ASM_IA64_UNALIGNED_H
+#ifndef _ASM_IA64_UNALIGNED_H_
+#define _ASM_IA64_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_le.h>
 
-#endif /* _ASM_IA64_UNALIGNED_H */
+#endif /* _ASM_IA64_UNALIGNED_H_ */

include/asm-m32r/unaligned.h +4 ~~-17~~

index fccc180..618c737 100644
@@ -1,19 +1,6 @@
-#ifndef _ASM_M32R_UNALIGNED_H
-#define _ASM_M32R_UNALIGNED_H
+#ifndef _ASM_M32R_UNALIGNED_H_
+#define _ASM_M32R_UNALIGNED_H_
 
-/*
- * For the benefit of those who are trying to port Linux to another
- * architecture, here are some C-language equivalents.
- */
+#include <linux/unaligned/no_builtin_memcpy.h>
 
-#include <asm/string.h>
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
-
-#endif /* _ASM_M32R_UNALIGNED_H */
+#endif /* _ASM_M32R_UNALIGNED_H_ */

include/asm-m68k/unaligned.h +4 ~~-11~~

index 804cb3f..71209d8 100644
@@ -1,16 +1,9 @@
-#ifndef __M68K_UNALIGNED_H
-#define __M68K_UNALIGNED_H
+#ifndef _ASM_M68K_UNALIGNED_H_
+#define _ASM_M68K_UNALIGNED_H_
 
 /*
  * The m68k can do unaligned accesses itself.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
+#include <linux/unaligned/access_ok.h>
 
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-
-#endif
+#endif /* _ASM_M68K_UNALIGNED_H_ */

include/asm-m68knommu/unaligned.h +5 ~~-11~~

index 869e9dd..65d9464 100644
@@ -1,23 +1,17 @@
-#ifndef __M68K_UNALIGNED_H
-#define __M68K_UNALIGNED_H
+#ifndef _ASM_M68KNOMMU_UNALIGNED_H_
+#define _ASM_M68KNOMMU_UNALIGNED_H_
 
 
 #ifdef CONFIG_COLDFIRE
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #else
 /*
  * The m68k can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif
 
-#endif
+#endif /* _ASM_M68KNOMMU_UNALIGNED_H_ */

include/asm-mips/unaligned.h +10 ~~-19~~

index 3249049..1cb8ce7 100644
@@ -5,25 +5,16 @@
  *
  * Copyright (C) 2007 Ralf Baechle (ralf-6z/[email protected])
  */
-#ifndef __ASM_GENERIC_UNALIGNED_H
-#define __ASM_GENERIC_UNALIGNED_H
+#ifndef _ASM_MIPS_UNALIGNED_H_
+#define _ASM_MIPS_UNALIGNED_H_
 
 #include <linux/compiler.h>
+#if defined(__MIPSEB__)
+#  include <linux/unaligned/generic_be.h>
+#elif defined(__MIPSEL__)
+#  include <linux/unaligned/generic_le.h>
+#else
+#  error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
+#endif
 
-#define get_unaligned(ptr)					\
-({								\
-	struct __packed {					\
-		typeof(*(ptr)) __v;				\
-	} *__p = (void *) (ptr);				\
-	__p->__v;						\
-})
-
-#define put_unaligned(val, ptr)					\
-do {								\
-	struct __packed {					\
-		typeof(*(ptr)) __v;				\
-	} *__p = (void *) (ptr);				\
-	__p->__v = (val);					\
-} while(0)
-
-#endif /* __ASM_GENERIC_UNALIGNED_H */
+#endif /* _ASM_MIPS_UNALIGNED_H_ */

include/asm-mn10300/unaligned.h +4 ~~-124~~

133 lines not on this page · raw message

include/asm-parisc/unaligned.h +1 -1

index 53c9058..865867c 100644
@@ -1,7 +1,7 @@
 #ifndef _ASM_PARISC_UNALIGNED_H_
 #define _ASM_PARISC_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
 #ifdef __KERNEL__
 struct pt_regs;

include/asm-powerpc/unaligned.h +4 ~~-11~~

index 6c95dfa..4b443a3 100644
@@ -1,19 +1,12 @@
-#ifndef _ASM_POWERPC_UNALIGNED_H
-#define _ASM_POWERPC_UNALIGNED_H
+#ifndef _ASM_POWERPC_UNALIGNED_H_
+#define _ASM_POWERPC_UNALIGNED_H_
 
 #ifdef __KERNEL__
 
 /*
  * The PowerPC can do unaligned accesses itself in big endian mode.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
-
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+#include <linux/unaligned/access_ok.h>
 
 #endif	/* __KERNEL__ */
-#endif	/* _ASM_POWERPC_UNALIGNED_H */
+#endif	/* _ASM_POWERPC_UNALIGNED_H_ */

include/asm-s390/unaligned.h +4 ~~-11~~

index 8ee86db..85047d7 100644
@@ -6,19 +6,12 @@
  *  Derived from "include/asm-i386/unaligned.h"
  */
 
-#ifndef __S390_UNALIGNED_H
-#define __S390_UNALIGNED_H
+#ifndef _ASM_S390_UNALIGNED_H_
+#define _ASM_S390_UNALIGNED_H_
 
 /*
  * The S390 can do unaligned accesses itself. 
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
+#include <linux/unaligned/access_ok.h>
 
-#define get_unaligned(ptr) (*(ptr))
-
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-
-#endif
+#endif /* _ASM_S390_UNALIGNED_H_ */

include/asm-sh/unaligned.h +8 -4

index 5250e30..dc9055c 100644
@@ -1,7 +1,11 @@
-#ifndef __ASM_SH_UNALIGNED_H
-#define __ASM_SH_UNALIGNED_H
+#ifndef _ASM_SH_UNALIGNED_H_
+#define _ASM_SH_UNALIGNED_H_
 
 /* SH can't handle unaligned accesses. */
-#include <asm-generic/unaligned.h>
+#ifdef __LITTLE_ENDIAN__
+#include <linux/unaligned/generic_le.h>
+#else
+#include <linux/unaligned/generic_be.h>
+#endif
 
-#endif /* __ASM_SH_UNALIGNED_H */
+#endif /* _ASM_SH_UNALIGNED_H_ */

include/asm-sparc/unaligned.h +2 -2

index b6f8edd..4a6b228 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_SPARC_UNALIGNED_H_
 #define _ASM_SPARC_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
-#endif /* _ASM_SPARC_UNALIGNED_H */
+#endif /* _ASM_SPARC_UNALIGNED_H_ */

include/asm-sparc64/unaligned.h +2 -2

index 1ed3ba5..8069e1e 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_SPARC64_UNALIGNED_H_
 #define _ASM_SPARC64_UNALIGNED_H_
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/generic_be.h>
 
-#endif /* _ASM_SPARC64_UNALIGNED_H */
+#endif /* _ASM_SPARC64_UNALIGNED_H_ */

include/asm-um/unaligned.h +3 -3

index 1d2497c..bc2cc11 100644
@@ -1,6 +1,6 @@
-#ifndef __UM_UNALIGNED_H
-#define __UM_UNALIGNED_H
+#ifndef _ASM_UM_UNALIGNED_H_
+#define _ASM_UM_UNALIGNED_H_
 
 #include "asm/arch/unaligned.h"
 
-#endif
+#endif /* _ASM_UM_UNALIGNED_H_ */

include/asm-v850/unaligned.h +6 ~~-111~~

123 lines not on this page · raw message

include/asm-x86/unaligned.h +4 ~~-32~~

index 913598d..1696bc0 100644
@@ -1,37 +1,9 @@
-#ifndef _ASM_X86_UNALIGNED_H
-#define _ASM_X86_UNALIGNED_H
+#ifndef _ASM_X86_UNALIGNED_H_
+#define _ASM_X86_UNALIGNED_H_
 
 /*
  * The x86 can do unaligned accesses itself.
- *
- * The strange macros are there to make sure these can't
- * be misused in a way that makes them not work on other
- * architectures where unaligned accesses aren't as simple.
  */
+#include <linux/unaligned/access_ok.h>
 
-/**
- * get_unaligned - get value from possibly mis-aligned location
- * @ptr: pointer to value
- *
- * This macro should be used for accessing values larger in size than
- * single bytes at locations that are expected to be improperly aligned,
- * e.g. retrieving a u16 value from a location not u16-aligned.
- *
- * Note that unaligned accesses can be very expensive on some architectures.
- */
-#define get_unaligned(ptr) (*(ptr))
-
-/**
- * put_unaligned - put value to a possibly mis-aligned location
- * @val: value to place
- * @ptr: pointer to location
- *
- * This macro should be used for placing values larger in size than
- * single bytes at locations that are expected to be improperly aligned,
- * e.g. writing a u16 value to a location not u16-aligned.
- *
- * Note that unaligned accesses can be very expensive on some architectures.
- */
-#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-
-#endif /* _ASM_X86_UNALIGNED_H */
+#endif /* _ASM_X86_UNALIGNED_H_ */

include/asm-xtensa/unaligned.h +4 ~~-14~~

index 2822089..6222cc4 100644
@@ -10,19 +10,9 @@
  * Copyright (C) 2001 - 2005 Tensilica Inc.
  */
 
-#ifndef _XTENSA_UNALIGNED_H
-#define _XTENSA_UNALIGNED_H
+#ifndef _ASM_XTENSA_UNALIGNED_H_
+#define _ASM_XTENSA_UNALIGNED_H_
 
-#include <linux/string.h>
+#include <linux/unaligned/no_builtin_memcpy.h>
 
-/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)				\
-  ({ __typeof__(*(ptr)) __tmp = (val);			\
-     memmove((ptr), &__tmp, sizeof(*(ptr)));		\
-     (void)0; })
-
-#endif	/* _XTENSA_UNALIGNED_H */
+#endif	/* _ASM_XTENSA_UNALIGNED_H_ */

Signature · 1 line

1.5.5.144.g3e42