Merge ../linux-2.6-x86

Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h

1 files changed, 20 insertions, 1 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 80744606bad1..eba835a2c2cd 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -45,6 +45,22 @@
 #define MCOUNT_REC()
 #endif
 
+#ifdef CONFIG_TRACE_BRANCH_PROFILING
+#define LIKELY_PROFILE()        VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+                                *(_ftrace_annotated_branch)                           \
+                                VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+#else
+#define LIKELY_PROFILE()
+#endif
+
+#ifdef CONFIG_PROFILE_ALL_BRANCHES
+#define BRANCH_PROFILE()        VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+                                *(_ftrace_branch)                             \
+                                VMLINUX_SYMBOL(__stop_branch_profile) = .;
+#else
+#define BRANCH_PROFILE()
+#endif
+
 /* .data section */
 #define DATA_DATA                                                       \
         *(.data)                                                        \
@@ -60,9 +76,12 @@
         VMLINUX_SYMBOL(__start___markers) = .;                          \
         *(__markers)                                                    \
         VMLINUX_SYMBOL(__stop___markers) = .;                           \
+        . = ALIGN(32);                                                  \
         VMLINUX_SYMBOL(__start___tracepoints) = .;                      \
         *(__tracepoints)                                                \
-        VMLINUX_SYMBOL(__stop___tracepoints) = .;
+        VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
+        LIKELY_PROFILE()                                                \
+        BRANCH_PROFILE()
 
 #define RO_DATA(align)                                                  \
         . = ALIGN((align));                                             \