Commit 5077c2a9 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of more uml asm/arch uses 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7127da4e

arch/um/include/asm/processor-i386.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/um/include/asm/processor-x86_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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; })

arch/um/include/asm/ptrace-generic.h

+1 −1
Original line number Diff line number Diff line
@@ -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"