From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 3 Sep 2015 14:28:50 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: android-x86-6.0-r1~787^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ff32a0def6e0d2e21a6c5ad1b00726592774018;p=android-x86%2Fkernel.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	drivers/perf/arm_pmu.c
---

3ff32a0def6e0d2e21a6c5ad1b00726592774018
diff --cc arch/arm/Kconfig
index 345882856287,74fe545af38a..45e635b87943
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1703,28 -1701,9 +1704,24 @@@ config HIGHPT
  	  consumed by page tables.  Setting this option will allow
  	  user-space 2nd level page tables to reside in high memory.
  
 +config CPU_SW_DOMAIN_PAN
 +	bool "Enable use of CPU domains to implement privileged no-access"
 +	depends on MMU && !ARM_LPAE
 +	default y
 +	help
 +	  Increase kernel security by ensuring that normal kernel accesses
 +	  are unable to access userspace addresses.  This can help prevent
 +	  use-after-free bugs becoming an exploitable privilege escalation
 +	  by ensuring that magic values (such as LIST_POISON) will always
 +	  fault when dereferenced.
 +
 +	  CPUs with low-vector mappings use a best-efforts implementation.
 +	  Their lower 1MB needs to remain accessible for the vectors, but
 +	  the remainder of userspace will become appropriately inaccessible.
 +
  config HW_PERF_EVENTS
- 	bool "Enable hardware performance counter support for perf events"
- 	depends on PERF_EVENTS
- 	default y
- 	help
- 	  Enable hardware performance counter support for perf events. If
- 	  disabled, perf events will use software events only.
+ 	def_bool y
+ 	depends on ARM_PMU
  
  config SYS_SUPPORTS_HUGETLBFS
         def_bool y