git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-mips
/
sim.h
diff --git
a/include/asm-mips/sim.h
b/include/asm-mips/sim.h
index
a88c337
..
9c2af1b
100644
(file)
--- a/
include/asm-mips/sim.h
+++ b/
include/asm-mips/sim.h
@@
-11,15
+11,12
@@
#include <linux/config.h>
#include <linux/config.h>
-#include <asm/offset.h>
-
-/* Used in declaration of save_static functions. */
-#define static_unused static __attribute__((unused))
+#include <asm/asm-offsets.h>
#define __str2(x) #x
#define __str(x) __str2(x)
#define __str2(x) #x
#define __str(x) __str2(x)
-#ifdef CONFIG_
MIPS32
+#ifdef CONFIG_
32BIT
#define save_static_function(symbol) \
__asm__ ( \
#define save_static_function(symbol) \
__asm__ ( \
@@
-39,14
+36,15
@@
__asm__ ( \
"sw\t$22,"__str(PT_R22)"($29)\n\t" \
"sw\t$23,"__str(PT_R23)"($29)\n\t" \
"sw\t$30,"__str(PT_R30)"($29)\n\t" \
"sw\t$22,"__str(PT_R22)"($29)\n\t" \
"sw\t$23,"__str(PT_R23)"($29)\n\t" \
"sw\t$30,"__str(PT_R30)"($29)\n\t" \
+ "j\t_" #symbol "\n\t" \
".end\t" #symbol "\n\t" \
".size\t" #symbol",. - " #symbol)
#define nabi_no_regargs
".end\t" #symbol "\n\t" \
".size\t" #symbol",. - " #symbol)
#define nabi_no_regargs
-#endif /* CONFIG_
MIPS32
*/
+#endif /* CONFIG_
32BIT
*/
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
#define save_static_function(symbol) \
__asm__ ( \
#define save_static_function(symbol) \
__asm__ ( \
@@
-66,6
+64,7
@@
__asm__ ( \
"sd\t$22,"__str(PT_R22)"($29)\n\t" \
"sd\t$23,"__str(PT_R23)"($29)\n\t" \
"sd\t$30,"__str(PT_R30)"($29)\n\t" \
"sd\t$22,"__str(PT_R22)"($29)\n\t" \
"sd\t$23,"__str(PT_R23)"($29)\n\t" \
"sd\t$30,"__str(PT_R30)"($29)\n\t" \
+ "j\t_" #symbol "\n\t" \
".end\t" #symbol "\n\t" \
".size\t" #symbol",. - " #symbol)
".end\t" #symbol "\n\t" \
".size\t" #symbol",. - " #symbol)
@@
-79,6
+78,6
@@
__asm__ ( \
unsigned long __dummy6, \
unsigned long __dummy7,
unsigned long __dummy6, \
unsigned long __dummy7,
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
#endif /* _ASM_SIM_H */
#endif /* _ASM_SIM_H */