mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25: sh: Use relative paths for mach/cpu symlinks. SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro. sh: Fix more user header breakage from sh64 integration. sh: Fix uImage build error. sh: Fix up the timer IRQ definition for SH7203. sh: Fix up the address error exception handler for SH-2. serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF.
This commit is contained in:
commit
2c7871982c
8 changed files with 25 additions and 16 deletions
|
|
@ -11,13 +11,13 @@
|
|||
static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
|
||||
{
|
||||
__asm__(
|
||||
#ifdef CONFIG_SUPERH32
|
||||
#ifdef __SH5__
|
||||
"byterev %0, %0\n\t"
|
||||
"shari %0, 32, %0"
|
||||
#else
|
||||
"swap.b %0, %0\n\t"
|
||||
"swap.w %0, %0\n\t"
|
||||
"swap.b %0, %0"
|
||||
#else
|
||||
"byterev %0, %0\n\t"
|
||||
"shari %0, 32, %0"
|
||||
#endif
|
||||
: "=r" (x)
|
||||
: "0" (x));
|
||||
|
|
@ -28,12 +28,11 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
|
|||
static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
|
||||
{
|
||||
__asm__(
|
||||
#ifdef CONFIG_SUPERH32
|
||||
"swap.b %0, %0"
|
||||
#else
|
||||
#ifdef __SH5__
|
||||
"byterev %0, %0\n\t"
|
||||
"shari %0, 32, %0"
|
||||
|
||||
#else
|
||||
"swap.b %0, %0"
|
||||
#endif
|
||||
: "=r" (x)
|
||||
: "0" (x));
|
||||
|
|
|
|||
|
|
@ -4,4 +4,10 @@
|
|||
# else
|
||||
# include "posix_types_64.h"
|
||||
# endif
|
||||
#else
|
||||
# ifdef __SH5__
|
||||
# include "posix_types_64.h"
|
||||
# else
|
||||
# include "posix_types_32.h"
|
||||
# endif
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue