From: Alex Shi <alex.shi@linaro.org>
Date: Fri, 21 Oct 2016 08:01:43 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/v4.4/topic/kprobes64' into linux-linaro-lsk... 
X-Git-Tag: firefly_0821_release~176^2~4^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a88e2aad5d0633e5c316af1d50c27aa0b22155d;p=firefly-linux-kernel-4.4.55.git

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

1a88e2aad5d0633e5c316af1d50c27aa0b22155d
diff --cc arch/arm64/kernel/Makefile
index 49a2430b0786,cfa290b7dfaf..69b15d97fb83
--- a/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