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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
processor.h
diff --git
a/include/asm-arm/processor.h
b/include/asm-arm/processor.h
index
04f4d34
..
1bbf161
100644
(file)
--- a/
include/asm-arm/processor.h
+++ b/
include/asm-arm/processor.h
@@
-20,7
+20,6
@@
#ifdef __KERNEL__
#include <asm/ptrace.h>
#ifdef __KERNEL__
#include <asm/ptrace.h>
-#include <asm/procinfo.h>
#include <asm/types.h>
union debug_insn {
#include <asm/types.h>
union debug_insn {
@@
-104,14
+103,14
@@
extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
#if __LINUX_ARM_ARCH__ >= 5
#define ARCH_HAS_PREFETCH
#if __LINUX_ARM_ARCH__ >= 5
#define ARCH_HAS_PREFETCH
-#define prefetch(ptr) \
- ({ \
- __asm__ __volatile__( \
- "pld\t%0"
\
- :
\
- : "o" (*(char *)
(ptr)) \
- : "cc");
\
- })
+static inline void prefetch(const void *ptr)
+{
+ __asm__ __volatile__(
+ "pld\t%0"
+ :
+ : "o" (*(char *)
ptr)
+ : "cc");
+}
#define ARCH_HAS_PREFETCHW
#define prefetchw(ptr) prefetch(ptr)
#define ARCH_HAS_PREFETCHW
#define prefetchw(ptr) prefetch(ptr)