diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:14:00 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:34 -0400 |
commit | a34978cbd977ab62c744f63daacd9dc1474482be (patch) | |
tree | 0d1ec8a6a1efb5fe18d3afbbe8ca187d2db30b6b /arch/x86 | |
parent | b8c655d727ebfe78769b62a0349227d5a656e967 (diff) |
um: kill system-um.h
most of it belonged in irqflags.h, actually
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/um/asm/system.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/um/asm/system.h b/arch/x86/um/asm/system.h index a89113bc74f2..a459fd9b7598 100644 --- a/arch/x86/um/asm/system.h +++ b/arch/x86/um/asm/system.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <asm/cpufeature.h> | 6 | #include <asm/cpufeature.h> |
7 | #include <asm/cmpxchg.h> | 7 | #include <asm/cmpxchg.h> |
8 | #include <asm/nops.h> | 8 | #include <asm/nops.h> |
9 | #include <asm/system-um.h> | ||
10 | 9 | ||
11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
12 | #include <linux/irqflags.h> | 11 | #include <linux/irqflags.h> |
@@ -130,4 +129,7 @@ static inline void rdtsc_barrier(void) | |||
130 | alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); | 129 | alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); |
131 | } | 130 | } |
132 | 131 | ||
132 | extern void *_switch_to(void *prev, void *next, void *last); | ||
133 | #define switch_to(prev, next, last) prev = _switch_to(prev, next, last) | ||
134 | |||
133 | #endif | 135 | #endif |