Merge branch 'tracing/fastboot' into cpus4096
Ingo Molnar [Fri, 12 Dec 2008 11:43:05 +0000 (12:43 +0100)]
1  2 
arch/x86/Kconfig
include/linux/sched.h
kernel/Makefile
kernel/extable.c
kernel/lockdep.c
kernel/sched.c

Simple merge
Simple merge
diff --cc 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
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge