projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
include
/
asm-frv
/
processor.h
diff --git
a/include/asm-frv/processor.h
b/include/asm-frv/processor.h
index
1c4dba1
..
3744f2e
100644
(file)
--- a/
include/asm-frv/processor.h
+++ b/
include/asm-frv/processor.h
@@
-21,6
+21,7
@@
*/
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
*/
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
+#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/sections.h>
#include <asm/segment.h>
#include <linux/linkage.h>
#include <asm/sections.h>
#include <asm/segment.h>
@@
-139,7
+140,7
@@
unsigned long get_wchan(struct task_struct *p);
extern struct task_struct *alloc_task_struct(void);
extern void free_task_struct(struct task_struct *p);
extern struct task_struct *alloc_task_struct(void);
extern void free_task_struct(struct task_struct *p);
-#define cpu_relax()
do { } while (0
)
+#define cpu_relax()
barrier(
)
/* data cache prefetch */
#define ARCH_HAS_PREFETCH
/* data cache prefetch */
#define ARCH_HAS_PREFETCH