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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-sh64
/
processor.h
diff --git
a/include/asm-sh64/processor.h
b/include/asm-sh64/processor.h
index
0f45ae6
..
eb2bee4
100644
(file)
--- a/
include/asm-sh64/processor.h
+++ b/
include/asm-sh64/processor.h
@@
-22,6
+22,7
@@
#include <asm/cache.h>
#include <asm/registers.h>
#include <linux/threads.h>
#include <asm/cache.h>
#include <asm/registers.h>
#include <linux/threads.h>
+#include <linux/compiler.h>
/*
* Default implementation of macro that returns current
/*
* Default implementation of macro that returns current
@@
-218,12
+219,6
@@
extern void release_thread(struct task_struct *);
*/
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
*/
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-/*
- * Bus types
- */
-#define MCA_bus 0
-#define MCA_bus__is_a_macro /* for versions in ksyms.c */
-
/* Copy and release all segment info associated with a VM */
#define copy_segments(p, mm) do { } while (0)
/* Copy and release all segment info associated with a VM */
#define copy_segments(p, mm) do { } while (0)
@@
-234,7
+229,7
@@
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
* FPU lazy state save handling.
*/
* FPU lazy state save handling.
*/
-
extern __inline__
void release_fpu(void)
+
static inline
void release_fpu(void)
{
unsigned long long __dummy;
{
unsigned long long __dummy;
@@
-246,7
+241,7
@@
extern __inline__ void release_fpu(void)
: "r" (SR_FD));
}
: "r" (SR_FD));
}
-
extern __inline__
void grab_fpu(void)
+
static inline
void grab_fpu(void)
{
unsigned long long __dummy;
{
unsigned long long __dummy;
@@
-285,7
+280,7
@@
extern unsigned long get_wchan(struct task_struct *p);
#define KSTK_EIP(tsk) ((tsk)->thread.pc)
#define KSTK_ESP(tsk) ((tsk)->thread.sp)
#define KSTK_EIP(tsk) ((tsk)->thread.pc)
#define KSTK_ESP(tsk) ((tsk)->thread.sp)
-#define cpu_relax()
do { } while (0
)
+#define cpu_relax()
barrier(
)
#endif /* __ASSEMBLY__ */
#endif /* __ASM_SH64_PROCESSOR_H */
#endif /* __ASSEMBLY__ */
#endif /* __ASM_SH64_PROCESSOR_H */