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

Commit 8bfcb396 authored Aug 18, 2008 by Thomas Petazzoni Committed by Ingo Molnar Aug 18, 2008

x86: make movsl_mask definition non-CPU specific



movsl_mask is currently defined in arch/x86/kernel/cpu/intel.c, which
contains code specific to Intel CPUs. However, movsl_mask is used in
the non-CPU specific code in arch/x86/lib/usercopy_32.c, which breaks
the compilation when support for Intel CPUs is compiled out.

This patch solves this problem by moving movsl_mask's definition close
to its users in arch/x86/lib/usercopy_32.c.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: michael@free-electrons.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 1a103907

arch/x86/kernel/cpu/intel.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,6 @@
	#include <mach_apic.h>		#include <mach_apic.h>
	#endif		#endif

	#ifdef CONFIG_X86_INTEL_USERCOPY
	/*
	* Alignment at which movsl is preferred for bulk memory copies.
	*/
	struct movsl_mask movsl_mask __read_mostly;
	#endif

	static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)		static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
	{		{
	/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */		/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */

arch/x86/lib/usercopy_32.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,13 @@
	#include <asm/uaccess.h>		#include <asm/uaccess.h>
	#include <asm/mmx.h>		#include <asm/mmx.h>

			#ifdef CONFIG_X86_INTEL_USERCOPY
			/*
			* Alignment at which movsl is preferred for bulk memory copies.
			*/
			struct movsl_mask movsl_mask __read_mostly;
			#endif

	static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)		static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
	{		{
	#ifdef CONFIG_X86_INTEL_USERCOPY		#ifdef CONFIG_X86_INTEL_USERCOPY