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

Commit 563a3308 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.138 (07c01385) into msm-4.4 



* refs/heads/tmp-07c01385
  Linux 4.4.138
  crypto: vmx - Remove overly verbose printk from AES init routines
  Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
  Input: goodix - add new ACPI id for GPD Win 2 touch screen
  kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
  vmw_balloon: fixing double free when batching mode is off
  serial: samsung: fix maxburst parameter for DMA transactions
  KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
  KVM: x86: introduce linear_{read,write}_system
  Clarify (and fix) MAX_LFS_FILESIZE macros
  gpio: No NULL owner
  x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code
  af_key: Always verify length of provided sadb_key
  x86/fpu: Fix math emulation in eager fpu mode
  x86/fpu: Fix FNSAVE usage in eagerfpu mode
  x86/fpu: Hard-disable lazy FPU mode
  x86/fpu: Fix eager-FPU handling on legacy FPU machines
  x86/fpu: Revert ("x86/fpu: Disable AVX when eagerfpu is off")
  x86/fpu: Fix 'no387' regression
  x86/fpu: Default eagerfpu=on on all CPUs
  x86/fpu: Disable AVX when eagerfpu is off
  x86/fpu: Disable MPX when eagerfpu is off
  x86/cpufeature: Remove unused and seldomly used cpu_has_xx macros
  x86: Remove unused function cpu_has_ht_siblings()
  x86/fpu: Fix early FPU command-line parsing

Change-Id: Ic1f041c07b90f130e7dcca9dc196df77848bcb1c
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 4ada752c 07c01385

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 137

SUBLEVEL = 138

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/crypto/chacha20_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct crypto_alg alg = { 


static int __init chacha20_simd_mod_init(void)

{

	if (!cpu_has_ssse3)

	if (!boot_cpu_has(X86_FEATURE_SSSE3))

		return -ENODEV;



#ifdef CONFIG_AS_AVX2

arch/x86/crypto/crc32c-intel_glue.c

+1 −6
Original line number Diff line number Diff line
@@ -58,16 +58,11 @@ 
asmlinkage unsigned int crc_pcl(const u8 *buffer, int len,

				unsigned int crc_init);

static int crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_EAGERFPU;

#if defined(X86_FEATURE_EAGER_FPU)

#define set_pcl_breakeven_point()					\

do {									\

	if (!use_eager_fpu())						\

		crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU;	\

} while (0)

#else

#define set_pcl_breakeven_point()					\

	(crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU)

#endif

#endif /* CONFIG_X86_64 */



static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)
@@ -257,7 +252,7 @@ static int __init crc32c_intel_mod_init(void) 
	if (!x86_match_cpu(crc32c_cpu_id))

		return -ENODEV;

#ifdef CONFIG_X86_64

	if (cpu_has_pclmulqdq) {

	if (boot_cpu_has(X86_FEATURE_PCLMULQDQ)) {

		alg.update = crc32c_pcl_intel_update;

		alg.finup = crc32c_pcl_intel_finup;

		alg.digest = crc32c_pcl_intel_digest;

arch/x86/include/asm/cmpxchg_32.h

+1 −1
Original line number Diff line number Diff line
@@ -109,6 +109,6 @@ static inline u64 __cmpxchg64_local(volatile u64 *ptr, u64 old, u64 new) 


#endif



#define system_has_cmpxchg_double() cpu_has_cx8

#define system_has_cmpxchg_double() boot_cpu_has(X86_FEATURE_CX8)



#endif /* _ASM_X86_CMPXCHG_32_H */

arch/x86/include/asm/cmpxchg_64.h

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 val) 
	cmpxchg_local((ptr), (o), (n));					\

})



#define system_has_cmpxchg_double() cpu_has_cx16

#define system_has_cmpxchg_double() boot_cpu_has(X86_FEATURE_CX16)



#endif /* _ASM_X86_CMPXCHG_64_H */