Merge remote-tracking branch 'origin/v4.4/topic/kprobes64' into linux-linaro-lsk...

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/debug-monitors.h
Simple merge

diff --cc arch/arm64/kernel/Makefile
index 49a2430b0786e6df6e8bd39a3d12811783eead7d,cfa290b7dfafe7fd2b941a0f04cf3d9d8ca0d36b..69b15d97fb83b1b853b32407a97ad0e8ec37ce37
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -26,11 -26,9 +26,10 @@@ $(obj)/%.stub.o: $(obj)/%.o FORC
        $(call if_changed,objcopy)
  
  arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o         \
-                                          sys_compat.o entry32.o               \
-                                          ../../arm/kernel/opcodes.o
+                                          sys_compat.o entry32.o
  arm64-obj-$(CONFIG_FUNCTION_TRACER)   += ftrace.o entry-ftrace.o
  arm64-obj-$(CONFIG_MODULES)           += arm64ksyms.o module.o
 +arm64-obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o
  arm64-obj-$(CONFIG_PERF_EVENTS)               += perf_regs.o perf_callchain.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)    += perf_event.o
  arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)        += hw_breakpoint.o
@@@ -42,10 -40,8 +41,10 @@@ arm64-obj-$(CONFIG_EFI)                     += efi.o efi-
  arm64-obj-$(CONFIG_PCI)                       += pci.o
  arm64-obj-$(CONFIG_ARMV8_DEPRECATED)  += armv8_deprecated.o
  arm64-obj-$(CONFIG_ACPI)              += acpi.o
 +arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL)       += acpi_parking_protocol.o
 +arm64-obj-$(CONFIG_RANDOMIZE_BASE)    += kaslr.o
  
- obj-y                                 += $(arm64-obj-y) vdso/
+ obj-y                                 += $(arm64-obj-y) vdso/ probes/
  obj-m                                 += $(arm64-obj-m)
  head-y                                        := head.o
  extra-y                                       += $(head-y) vmlinux.lds

diff --cc arch/arm64/kernel/arm64ksyms.c
Simple merge

diff --cc arch/arm64/kernel/armv8_deprecated.c
Simple merge

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge