Commit a57ed936 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/asm changes from Ingo Molnar:
 "The biggest change (by line count) is the unification of the XOR code
  and then the introduction of an additional SSE based XOR assembly
  method.

  The other bigger change is the head_32.S rework/cleanup by Borislav
  Petkov.

  Last but not least there's the usual laundry list of small but
  dangerous (and hopefully perfectly tested) changes to subtle low level
  x86 code, plus cleanups."

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, head_32: Give the 6 label a real name
  x86, head_32: Remove second CPUID detection from default_entry
  x86: Detect CPUID support early at boot
  x86, head_32: Remove i386 pieces
  x86: Require MOVBE feature in cpuid when we use it
  x86: Enable ARCH_USE_BUILTIN_BSWAP
  x86/xor: Add alternative SSE implementation only prefetching once per 64-byte line
  x86/xor: Unify SSE-base xor-block routines
  x86: Fix a typo
  x86/mm: Fix the argument passed to sync_global_pgds()
  x86/mm: Convert update_mmu_cache() and update_mmu_cache_pmd() to functions
  ix86: Tighten asmlinkage_protect() constraints
parents 5800700f 5e2a044d

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ config X86 
	select MODULES_USE_ELF_RELA if X86_64

	select CLONE_BACKWARDS if X86_32

	select GENERIC_SIGALTSTACK

	select ARCH_USE_BUILTIN_BSWAP



config INSTRUCTION_DECODER

	def_bool y

arch/x86/include/asm/linkage.h

+9 −9
Original line number Diff line number Diff line
@@ -27,20 +27,20 @@ 
#define __asmlinkage_protect0(ret) \

	__asmlinkage_protect_n(ret)

#define __asmlinkage_protect1(ret, arg1) \

	__asmlinkage_protect_n(ret, "g" (arg1))

	__asmlinkage_protect_n(ret, "m" (arg1))

#define __asmlinkage_protect2(ret, arg1, arg2) \

	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2))

	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2))

#define __asmlinkage_protect3(ret, arg1, arg2, arg3) \

	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3))

	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3))

#define __asmlinkage_protect4(ret, arg1, arg2, arg3, arg4) \

	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \

			      "g" (arg4))

	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \

			      "m" (arg4))

#define __asmlinkage_protect5(ret, arg1, arg2, arg3, arg4, arg5) \

	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \

			      "g" (arg4), "g" (arg5))

	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \

			      "m" (arg4), "m" (arg5))

#define __asmlinkage_protect6(ret, arg1, arg2, arg3, arg4, arg5, arg6) \

	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \

			      "g" (arg4), "g" (arg5), "g" (arg6))

	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \

			      "m" (arg4), "m" (arg5), "m" (arg6))



#endif /* CONFIG_X86_32 */

arch/x86/include/asm/pgtable.h

+12 −0
Original line number Diff line number Diff line
@@ -786,6 +786,18 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) 
       memcpy(dst, src, count * sizeof(pgd_t));

}



/*

 * The x86 doesn't have any external MMU info: the kernel page

 * tables contain all the necessary information.

 */

static inline void update_mmu_cache(struct vm_area_struct *vma,

		unsigned long addr, pte_t *ptep)

{

}

static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,

		unsigned long addr, pmd_t *pmd)

{

}



#include <asm-generic/pgtable.h>

#endif	/* __ASSEMBLY__ */

arch/x86/include/asm/pgtable_32.h

+0 −7
Original line number Diff line number Diff line
@@ -66,13 +66,6 @@ do { \ 
	__flush_tlb_one((vaddr));		\

} while (0)



/*

 * The i386 doesn't have any external MMU info: the kernel page

 * tables contain all the necessary information.

 */

#define update_mmu_cache(vma, address, ptep) do { } while (0)

#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)



#endif /* !__ASSEMBLY__ */



/*

arch/x86/include/asm/pgtable_64.h

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 
#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))

#define pte_unmap(pte) ((void)(pte))/* NOP */



#define update_mmu_cache(vma, address, ptep) do { } while (0)

#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)



/* Encode and de-code a swap entry */

#if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE

#define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE