Merge branch 'tracing/fastboot' into cpus4096

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/Makefile
index 010ccb311166fe8708cd2f08d04a36c66d7365d5,19fad003b19d6ac0752597f5a23e18341d1d579a..6a212b842d86b9c4f7afd40cf4af6c2f8269518b
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -19,11 -19,8 +19,7 @@@ CFLAGS_REMOVE_mutex-debug.o = -p
  CFLAGS_REMOVE_rtmutex-debug.o = -pg
  CFLAGS_REMOVE_cgroup-debug.o = -pg
  CFLAGS_REMOVE_sched_clock.o = -pg
 -CFLAGS_REMOVE_sched.o = -pg
  endif
- ifdef CONFIG_FUNCTION_RET_TRACER
- CFLAGS_REMOVE_extable.o = -pg # For __kernel_text_address()
- CFLAGS_REMOVE_module.o = -pg # For __module_text_address()
- endif
  
  obj-$(CONFIG_FREEZER) += freezer.o
  obj-$(CONFIG_PROFILING) += profile.o

diff --cc kernel/extable.c
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/sched.c
Simple merge