Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/urgent (14c93e8e) · Commits · e / devices / android_kernel_sony_msm8998

arch/x86/include/asm/pgtable_types.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -277,6 +277,7 @@ static inline pteval_t pte_flags(pte_t pte)
	typedef struct page *pgtable_t;		typedef struct page *pgtable_t;

	extern pteval_t __supported_pte_mask;		extern pteval_t __supported_pte_mask;
			extern void set_nx(void);
	extern int nx_enabled;		extern int nx_enabled;

	#define pgprot_writecombine pgprot_writecombine		#define pgprot_writecombine pgprot_writecombine

+2 −1

Original line number	Original line	Diff line number	Diff line
	obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \		obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
	pat.o pgtable.o physaddr.o gup.o		pat.o pgtable.o physaddr.o gup.o setup_nx.o

	# Make sure __phys_addr has no stackprotector		# Make sure __phys_addr has no stackprotector
	nostackp := $(call cc-option, -fno-stack-protector)		nostackp := $(call cc-option, -fno-stack-protector)
	CFLAGS_physaddr.o := $(nostackp)		CFLAGS_physaddr.o := $(nostackp)
			CFLAGS_setup_nx.o := $(nostackp)

	obj-$(CONFIG_SMP) += tlb.o		obj-$(CONFIG_SMP) += tlb.o

+0 −63

Original line number	Original line	Diff line number	Diff line
	@@ -28,69 +28,6 @@ int direct_gbpages
	#endif		#endif
	;		;

	int nx_enabled;

	#if defined(CONFIG_X86_64) \|\| defined(CONFIG_X86_PAE)
	static int disable_nx __cpuinitdata;

	/*
	* noexec = on\|off
	*
	* Control non-executable mappings for processes.
	*
	* on Enable
	* off Disable
	*/
	static int __init noexec_setup(char *str)
	{
	if (!str)
	return -EINVAL;
	if (!strncmp(str, "on", 2)) {
	__supported_pte_mask \|= _PAGE_NX;
	disable_nx = 0;
	} else if (!strncmp(str, "off", 3)) {
	disable_nx = 1;
	__supported_pte_mask &= ~_PAGE_NX;
	}
	return 0;
	}
	early_param("noexec", noexec_setup);
	#endif

	#ifdef CONFIG_X86_PAE
	static void __init set_nx(void)
	{
	unsigned int v[4], l, h;

	if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
	cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);

	if ((v[3] & (1 << 20)) && !disable_nx) {
	rdmsr(MSR_EFER, l, h);
	l \|= EFER_NX;
	wrmsr(MSR_EFER, l, h);
	nx_enabled = 1;
	__supported_pte_mask \|= _PAGE_NX;
	}
	}
	}
	#else
	static inline void set_nx(void)
	{
	}
	#endif

	#ifdef CONFIG_X86_64
	void __cpuinit check_efer(void)
	{
	unsigned long efer;

	rdmsrl(MSR_EFER, efer);
	if (!(efer & EFER_NX) \|\| disable_nx)
	__supported_pte_mask &= ~_PAGE_NX;
	}
	#endif

	static void __init find_early_table_space(unsigned long end, int use_pse,		static void __init find_early_table_space(unsigned long end, int use_pse,
	int use_gbpages)		int use_gbpages)
	{		{

0 → 100644

+69 −0

Original line number	Original line	Diff line number	Diff line
			#include <linux/spinlock.h>
			#include <linux/errno.h>
			#include <linux/init.h>

			#include <asm/pgtable.h>

			int nx_enabled;

			#if defined(CONFIG_X86_64) \|\| defined(CONFIG_X86_PAE)
			static int disable_nx __cpuinitdata;

			/*
			* noexec = on\|off
			*
			* Control non-executable mappings for processes.
			*
			* on Enable
			* off Disable
			*/
			static int __init noexec_setup(char *str)
			{
			if (!str)
			return -EINVAL;
			if (!strncmp(str, "on", 2)) {
			__supported_pte_mask \|= _PAGE_NX;
			disable_nx = 0;
			} else if (!strncmp(str, "off", 3)) {
			disable_nx = 1;
			__supported_pte_mask &= ~_PAGE_NX;
			}
			return 0;
			}
			early_param("noexec", noexec_setup);
			#endif

			#ifdef CONFIG_X86_PAE
			void __init set_nx(void)
			{
			unsigned int v[4], l, h;

			if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
			cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);

			if ((v[3] & (1 << 20)) && !disable_nx) {
			rdmsr(MSR_EFER, l, h);
			l \|= EFER_NX;
			wrmsr(MSR_EFER, l, h);
			nx_enabled = 1;
			__supported_pte_mask \|= _PAGE_NX;
			}
			}
			}
			#else
			void set_nx(void)
			{
			}
			#endif

			#ifdef CONFIG_X86_64
			void __cpuinit check_efer(void)
			{
			unsigned long efer;

			rdmsrl(MSR_EFER, efer);
			if (!(efer & EFER_NX) \|\| disable_nx)
			__supported_pte_mask &= ~_PAGE_NX;
			}
			#endif

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1082,6 +1082,11 @@ asmlinkage void __init xen_start_kernel(void)

	__supported_pte_mask \|= _PAGE_IOMAP;		__supported_pte_mask \|= _PAGE_IOMAP;

			#ifdef CONFIG_X86_64
			/* Work out if we support NX */
			check_efer();
			#endif

	xen_setup_features();		xen_setup_features();

	/* Get mfn list */		/* Get mfn list */
	@@ -1123,11 +1128,6 @@ asmlinkage void __init xen_start_kernel(void)

	pgd = (pgd_t *)xen_start_info->pt_base;		pgd = (pgd_t *)xen_start_info->pt_base;

	#ifdef CONFIG_X86_64
	/* Work out if we support NX */
	check_efer();
	#endif

	/* Don't do the full vcpu_info placement stuff until we have a		/* Don't do the full vcpu_info placement stuff until we have a
	possible map and a non-dummy shared_info. */		possible map and a non-dummy shared_info. */
	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];		per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];