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>

diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/include/asm/processor-i386.h
index a2b7fe13fe1e48179b1fd5f0eeff8315dcb15b0d..4f8be00636391b310c4cae87a25cdd02cd48de3c 100644 (file)
--- 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,
         memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static 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 e50933175e9105206e207afcdc61ec46d0d49463..875a26a62614a9ae7f1788cc6549ebafc99aca07 100644 (file)
--- 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,
        to->fs = from->fs;
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 #define current_text_addr() \
        ({ 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 315749705ea1b91fccf261ba1161eb785cff9701..6c8899013c92cbf45eaa1039142179374e8136ba 100644 (file)
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
@@ -8,7 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include "asm/arch/ptrace-abi.h"
+#include <asm/ptrace-abi.h>
 #include <asm/user.h>
 #include "sysdep/ptrace.h"