From: Michael Ellerman <mpe@ellerman.id.au>
Date: Mon, 18 Apr 2016 10:45:32 +0000 (+1000)
Subject: Merge branch 'topic/livepatch' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8404410b296095c78ed63f163ac5d417ff0647dd;p=deliverable%2Flinux.git

Merge branch 'topic/livepatch' into next

Merge the support for live patching on ppc64le using mprofile-kernel.
This branch has also been merged into the livepatching tree for v4.7.
---

8404410b296095c78ed63f163ac5d417ff0647dd
diff --cc arch/powerpc/Kconfig
index fbebde0771c8,926c0eafbee3..9b5c7bcc06c4
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -159,7 -159,7 +159,8 @@@ config PP
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
  	select HAVE_ARCH_SECCOMP_FILTER
  	select ARCH_HAS_UBSAN_SANITIZE_ALL
 +	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
+ 	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
  
  config GENERIC_CSUM
  	def_bool CPU_LITTLE_ENDIAN
diff --cc arch/powerpc/kernel/process.c
index 4695088e7dd2,a38ce49648cb..ad79816f13fe
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@@ -56,7 -55,8 +56,9 @@@
  #include <asm/firmware.h>
  #endif
  #include <asm/code-patching.h>
 +#include <asm/exec.h>
+ #include <asm/livepatch.h>
+ 
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>