Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

Pull livepatching updates from Jiri Kosina:

 - fix for patching modules that contain .altinstructions or
   .parainstructions sections, from Jessica Yu

 - make TAINT_LIVEPATCH a per-module flag (so that it's immediately
   clear which module caused the taint), from Josh Poimboeuf

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch/module: make TAINT_LIVEPATCH module-specific
  Documentation: livepatch: add section about arch-specific code
  livepatch/x86: apply alternatives and paravirt patches after relocations
  livepatch: use arch_klp_init_object_loaded() to finish arch-specific tasks

diff --combined arch/x86/kernel/Makefile
index 45257cf8437072e927ea39ae29cfd97644cc4e0b,4f656fe156fd644a395a88715947ab1e75761e94..4dd5d500eb6024cc27492d49a2458213e44bdca6
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -83,6 -83,7 +83,7 @@@ obj-$(CONFIG_X86_MPPARSE)     += mpparse.
  obj-y                         += apic/
  obj-$(CONFIG_X86_REBOOTFIXUPS)        += reboot_fixups_32.o
  obj-$(CONFIG_DYNAMIC_FTRACE)  += ftrace.o
+ obj-$(CONFIG_LIVEPATCH)       += livepatch.o
  obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
  obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
  obj-$(CONFIG_X86_TSC)         += trace_clock.o
@@@ -125,12 -126,6 +126,12 @@@ obj-$(CONFIG_EFI)                        += sysfb_efi.
  obj-$(CONFIG_PERF_EVENTS)             += perf_regs.o
  obj-$(CONFIG_TRACING)                 += tracepoint.o
  
 +ifdef CONFIG_FRAME_POINTER
 +obj-y                                 += unwind_frame.o
 +else
 +obj-y                                 += unwind_guess.o
 +endif
 +
  ###
  # 64 bit specific files
  ifeq ($(CONFIG_X86_64),y)