From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jul 2015 19:28:30 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6361c845ceab326a306412349fa6b125700b2cec;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes (and cleanups) from Catalin Marinas:
 "Various arm64 fixes:

   - suspicious RCU usage warning
   - BPF (out of bounds array read and endianness conversion)
   - perf (of_node usage after of_node_put, cpu_pmu->plat_device
     assignment)
   - huge pmd/pud check for value 0
   - rate-limiting should only take unhandled signals into account

  Clean-up:

   - incorrect use of pgprot_t type
   - unused header include
   - __init annotation to arm_cpuidle_init
   - pr_debug instead of pr_error for disabled GICC entries in
     ACPI/MADT"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Fix show_unhandled_signal_ratelimited usage
  ARM64 / SMP: Switch pr_err() to pr_debug() for disabled GICC entry
  arm64: cpuidle: add __init section marker to arm_cpuidle_init
  arm64: Don't report clear pmds and puds as huge
  arm64: perf: fix unassigned cpu_pmu->plat_device when probing PMU PPIs
  arm64: perf: Don't use of_node after putting it
  arm64: fix incorrect use of pgprot_t variable
  arm64/hw_breakpoint.c: remove unnecessary header
  arm64: bpf: fix endianness conversion bugs
  arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
  ARM64: smp: Fix suspicious RCU usage with ipi tracepoints
---

6361c845ceab326a306412349fa6b125700b2cec
diff --cc arch/arm64/mm/hugetlbpage.c
index cccc4af87a03,0eeb4f0930a0..831ec534d449
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@@ -31,9 -31,16 +31,9 @@@
  #include <asm/tlbflush.h>
  #include <asm/pgalloc.h>
  
 -#ifndef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
 -int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
 -{
 -	return 0;
 -}
 -#endif
 -
  int pmd_huge(pmd_t pmd)
  {
- 	return !(pmd_val(pmd) & PMD_TABLE_BIT);
+ 	return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
  }
  
  int pud_huge(pud_t pud)