git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'connlimit' of git://dev.medozas.de/linux
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
processor.h
diff --git
a/arch/m68k/include/asm/processor.h
b/arch/m68k/include/asm/processor.h
index
7a6a759
..
278c69b
100644
(file)
--- a/
arch/m68k/include/asm/processor.h
+++ b/
arch/m68k/include/asm/processor.h
@@
-20,23
+20,26
@@
static inline unsigned long rdusp(void)
{
static inline unsigned long rdusp(void)
{
-#ifdef CONFIG_COLDFIRE
+#ifdef CONFIG_COLDFIRE
_SW_A7
extern unsigned int sw_usp;
return sw_usp;
#else
extern unsigned int sw_usp;
return sw_usp;
#else
- unsigned long usp;
- __asm__ __volatile__("move %/usp,%0" : "=a" (usp));
+ register unsigned long usp __asm__("a0");
+ /* move %usp,%a0 */
+ __asm__ __volatile__(".word 0x4e68" : "=a" (usp));
return usp;
#endif
}
static inline void wrusp(unsigned long usp)
{
return usp;
#endif
}
static inline void wrusp(unsigned long usp)
{
-#ifdef CONFIG_COLDFIRE
+#ifdef CONFIG_COLDFIRE
_SW_A7
extern unsigned int sw_usp;
sw_usp = usp;
#else
extern unsigned int sw_usp;
sw_usp = usp;
#else
- __asm__ __volatile__("move %0,%/usp" : : "a" (usp));
+ register unsigned long a0 __asm__("a0") = usp;
+ /* move %a0,%usp */
+ __asm__ __volatile__(".word 0x4e60" : : "a" (a0) );
#endif
}
#endif
}