aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-18 00:19:01 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 01:55:20 -0400
commit5077c2a9cd43e8db71f8257e745e1d27e7b79d3f (patch)
treea2073f34796801cbcb2dd0ec4828fe3e838e099b /arch/um
parent7127da4ee4447cb718c5ae553878458ec5e648f8 (diff)
x86, um: get rid of more uml asm/arch uses
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/processor-i386.h2
-rw-r--r--arch/um/include/asm/processor-x86_64.h2
-rw-r--r--arch/um/include/asm/ptrace-generic.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/include/asm/processor-i386.h
index a2b7fe13fe1e..4f8be0063639 100644
--- a/arch/um/include/asm/processor-i386.h
+++ b/arch/um/include/asm/processor-i386.h
@@ -48,7 +48,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
48 memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array)); 48 memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
49} 49}
50 50
51#include "asm/arch/user.h" 51#include <asm/user.h>
52 52
53/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ 53/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
54static inline void rep_nop(void) 54static inline void rep_nop(void)
diff --git a/arch/um/include/asm/processor-x86_64.h b/arch/um/include/asm/processor-x86_64.h
index e50933175e91..875a26a62614 100644
--- a/arch/um/include/asm/processor-x86_64.h
+++ b/arch/um/include/asm/processor-x86_64.h
@@ -40,7 +40,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
40 to->fs = from->fs; 40 to->fs = from->fs;
41} 41}
42 42
43#include "asm/arch/user.h" 43#include <asm/user.h>
44 44
45#define current_text_addr() \ 45#define current_text_addr() \
46 ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; }) 46 ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
index 315749705ea1..6c8899013c92 100644
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
@@ -8,7 +8,7 @@
8 8
9#ifndef __ASSEMBLY__ 9#ifndef __ASSEMBLY__
10 10
11#include "asm/arch/ptrace-abi.h" 11#include <asm/ptrace-abi.h>
12#include <asm/user.h> 12#include <asm/user.h>
13#include "sysdep/ptrace.h" 13#include "sysdep/ptrace.h"
14 14