aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/um/asm/processor_64.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-20 17:23:39 -0500
committerRichard Weinberger <richard@nod.at>2012-03-25 00:29:55 +0100
commitc56334dbf7e8772ed84390bc4664427f0a7f3b25 (patch)
tree7deaf851c0baa7bab6eb9446093833e81f57683a /arch/x86/um/asm/processor_64.h
parentum: switch close_chan() to struct line (diff)
downloadlinux-dev-c56334dbf7e8772ed84390bc4664427f0a7f3b25.tar.xz
linux-dev-c56334dbf7e8772ed84390bc4664427f0a7f3b25.zip
um: merge processor_{32,64}.h a bit...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to '')
-rw-r--r--arch/x86/um/asm/processor_64.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/um/asm/processor_64.h b/arch/x86/um/asm/processor_64.h
index 61de92d916c3..4b02a8455bd1 100644
--- a/arch/x86/um/asm/processor_64.h
+++ b/arch/x86/um/asm/processor_64.h
@@ -14,14 +14,6 @@ struct arch_thread {
struct faultinfo faultinfo;
};
-/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
-static inline void rep_nop(void)
-{
- __asm__ __volatile__("rep;nop": : :"memory");
-}
-
-#define cpu_relax() rep_nop()
-
#define INIT_ARCH_THREAD { .debugregs = { [ 0 ... 7 ] = 0 }, \
.debugregs_seq = 0, \
.fs = 0, \
@@ -37,8 +29,6 @@ static inline void arch_copy_thread(struct arch_thread *from,
to->fs = from->fs;
}
-#include <asm/user.h>
-
#define current_text_addr() \
({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })