From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Aug 2008 04:19:01 +0000 (-0400)
Subject: x86, um: get rid of more uml asm/arch uses
X-Git-Tag: v2.6.28-rc1~25^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5077c2a9cd43e8db71f8257e745e1d27e7b79d3f;p=thirdparty%2Fkernel%2Flinux.git

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 a2b7fe13fe1e4..4f8be00636391 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,
         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 e50933175e910..875a26a62614a 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,
 	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 315749705ea1b..6c8899013c92c 100644
--- 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"