[PATCH] uml: remove pte_mkexec (5906e417) · Commits · 戴 / test

Andi is making pte_mkexec go away, and UML had one of the last uses. This removes the use and the definition. Signed-off-by:

Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Andi Kleen <ak@muc.de> Signed-off-by:

arch/um/kernel/skas/mmu.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,10 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
		#endif

		*pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT));
		pte = pte_mkexec(pte);
		pte = pte_wrprotect(pte);
		/* This is wrong for the code page, but it doesn't matter since the
		* stub is mapped by hand with the correct permissions.
		*/
		pte = pte_mkwrite(pte);
		return(0);

		out_pmd:

+0 −6

Original line number	Diff line number	Diff line
		@@ -274,12 +274,6 @@ static inline pte_t pte_mkread(pte_t pte)
		return(pte_mknewprot(pte));
		}

		static inline pte_t pte_mkexec(pte_t pte)
		{
		pte_set_bits(pte, _PAGE_USER);
		return(pte_mknewprot(pte));
		}

		static inline pte_t pte_mkdirty(pte_t pte)
		{
		pte_set_bits(pte, _PAGE_DIRTY);