Merge 4.4.149 into android-4.4

Changes in 4.4.149
	x86/mm: Disable ioremap free page handling on x86-PAE
	tcp: Fix missing range_truesize enlargement in the backport
	kasan: don't emit builtin calls when sanitization is off
	i2c: ismt: fix wrong device address when unmap the data buffer
	kbuild: verify that $DEPMOD is installed
	crypto: vmac - require a block cipher with 128-bit block size
	crypto: vmac - separate tfm and request context
	crypto: blkcipher - fix crash flushing dcache in error path
	crypto: ablkcipher - fix crash flushing dcache in error path
	ASoC: Intel: cht_bsw_max98090_ti: Fix jack initialization
	Bluetooth: hidp: buffer overflow in hidp_process_report
	ioremap: Update pgtable free interfaces with addr
	x86/mm: Add TLB purge to free pmd/pte page interfaces
	Linux 4.4.149

Change-Id: I1e23095dd229992359341bda5c05e9b5b59fec45
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --cc Makefile
index f2d2f6c,e7c46ec..1c6a543
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -419,7 -418,8 +419,9 @@@ export MAKE AWK GENKSYMS INSTALLKERNEL 
  export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
  
  export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
- export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV CFLAGS_KCOV CFLAGS_KASAN
+ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
+ export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE
++export CFLAGS_KCOV
  export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
  export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
  export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL

diff --cc arch/arm64/mm/mmu.c
index 69e220b,e9d96b0..1175bac
--- 1/arch/arm64/mm/mmu.c
--- 2/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@@ -852,49 -698,8 +852,49 @@@ void *__init fixmap_remap_fdt(phys_addr
        return dt_virt;
  }
  
 +int __init arch_ioremap_pud_supported(void)
 +{
 +      /* only 4k granule supports level 1 block mappings */
 +      return IS_ENABLED(CONFIG_ARM64_4K_PAGES);
 +}
 +
 +int __init arch_ioremap_pmd_supported(void)
 +{
 +      return 1;
 +}
 +
 +int pud_set_huge(pud_t *pud, phys_addr_t phys, pgprot_t prot)
 +{
 +      BUG_ON(phys & ~PUD_MASK);
 +      set_pud(pud, __pud(phys | PUD_TYPE_SECT | pgprot_val(mk_sect_prot(prot))));
 +      return 1;
 +}
 +
 +int pmd_set_huge(pmd_t *pmd, phys_addr_t phys, pgprot_t prot)
 +{
 +      BUG_ON(phys & ~PMD_MASK);
 +      set_pmd(pmd, __pmd(phys | PMD_TYPE_SECT | pgprot_val(mk_sect_prot(prot))));
 +      return 1;
 +}
 +
 +int pud_clear_huge(pud_t *pud)
 +{
 +      if (!pud_sect(*pud))
 +              return 0;
 +      pud_clear(pud);
 +      return 1;
 +}
 +
 +int pmd_clear_huge(pmd_t *pmd)
 +{
 +      if (!pmd_sect(*pmd))
 +              return 0;
 +      pmd_clear(pmd);
 +      return 1;
 +}
 +
  #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
- int pud_free_pmd_page(pud_t *pud)
+ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
  {
        return pud_none(*pud);
  }

diff --cc crypto/blkcipher.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc scripts/Makefile.lib
index 6e082c2,a2d0e6d..434a0b8
--- 1/scripts/Makefile.lib
--- 2/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -126,15 -126,9 +126,15 @@@ endi
  ifeq ($(CONFIG_KASAN),y)
  _c_flags += $(if $(patsubst n%,, \
                $(KASAN_SANITIZE_$(basetarget).o)$(KASAN_SANITIZE)y), \
-               $(CFLAGS_KASAN))
+               $(CFLAGS_KASAN), $(CFLAGS_KASAN_NOSANITIZE))
  endif
  
 +ifeq ($(CONFIG_KCOV),y)
 +_c_flags += $(if $(patsubst n%,, \
 +      $(KCOV_INSTRUMENT_$(basetarget).o)$(KCOV_INSTRUMENT)y), \
 +      $(CFLAGS_KCOV))
 +endif
 +
  # If building the kernel in a separate objtree expand all occurrences
  # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').