Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22cac167 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: define architectural characteristics in uaccess.h. 



Remove them from the arch-specific file.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8bc7de0c

include/asm-x86/uaccess.h

+3 −0
Original line number Diff line number Diff line
@@ -441,9 +441,12 @@ extern struct movsl_mask { 
} ____cacheline_aligned_in_smp movsl_mask;

#endif



#define ARCH_HAS_NOCACHE_UACCESS 1



#ifdef CONFIG_X86_32

# include "uaccess_32.h"

#else

# define ARCH_HAS_SEARCH_EXTABLE

# include "uaccess_64.h"

#endif

include/asm-x86/uaccess_32.h

+0 −2
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) 
	return __copy_from_user_ll(to, from, n);

}



#define ARCH_HAS_NOCACHE_UACCESS



static __always_inline unsigned long __copy_from_user_nocache(void *to,

				const void __user *from, unsigned long n)

{

include/asm-x86/uaccess_64.h

+0 −3
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#include <linux/prefetch.h>

#include <asm/page.h>



#define ARCH_HAS_SEARCH_EXTABLE



/*

 * Copy To/From Userspace

 */
@@ -180,7 +178,6 @@ __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) 
	return copy_user_generic((__force void *)dst, src, size);

}



#define ARCH_HAS_NOCACHE_UACCESS 1

extern long __copy_user_nocache(void *dst, const void __user *src,

				unsigned size, int zerorest);