summaryrefslogtreecommitdiffstats
path: root/arch/x86/um/asm/processor_32.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_32.h
parent10c890c0a303070652f5374ea31a0b29350d14d9 (diff)
downloadlinux-c56334dbf7e8772ed84390bc4664427f0a7f3b25.tar.bz2
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 'arch/x86/um/asm/processor_32.h')
-rw-r--r--arch/x86/um/asm/processor_32.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/um/asm/processor_32.h b/arch/x86/um/asm/processor_32.h
index 018f732704dd..6c6689e574ce 100644
--- a/arch/x86/um/asm/processor_32.h
+++ b/arch/x86/um/asm/processor_32.h
@@ -45,16 +45,6 @@ static inline void arch_copy_thread(struct arch_thread *from,
memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
}
-#include <asm/user.h>
-
-/* 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()
-
/*
* Default implementation of macro that returns current
* instruction pointer ("program counter"). Stolen