Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)
  perf stat: Add more cache-miss percentage printouts
  perf stat: Add -d -d and -d -d -d options to show more CPU events
  ftrace/kbuild: Add recordmcount files to force full build
  ftrace: Add self-tests for multiple function trace users
  ftrace: Modify ftrace_set_filter/notrace to take ops
  ftrace: Allow dynamically allocated function tracers
  ftrace: Implement separate user function filtering
  ftrace: Free hash with call_rcu_sched()
  ftrace: Have global_ops store the functions that are to be traced
  ftrace: Add ops parameter to ftrace_startup/shutdown functions
  ftrace: Add enabled_functions file
  ftrace: Use counters to enable functions to trace
  ftrace: Separate hash allocation and assignment
  ftrace: Create a global_ops to hold the filter and notrace hashes
  ftrace: Use hash instead for FTRACE_FL_FILTER
  ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions
  perf bench, x86: Add alternatives-asm.h wrapper
  x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit
  x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB
  x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB
  ...

1 files changed, 4 insertions, 10 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index b27445e00b6c..077c00d94f6e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -170,6 +170,10 @@
         STRUCT_ALIGN();                                                 \
         *(__tracepoints)                                                \
         /* implement dynamic printk debug */                            \
+        . = ALIGN(8);                                                   \
+        VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+        *(__jump_table)                                                 \
+        VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
         . = ALIGN(8);                                                   \
         VMLINUX_SYMBOL(__start___verbose) = .;                          \
         *(__verbose)                                                    \
@@ -228,8 +232,6 @@
                                                                         \
         BUG_TABLE                                                       \
                                                                         \
-        JUMP_TABLE                                                      \
-                                                                        \
         /* PCI quirks */                                                \
         .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
                 VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \
@@ -589,14 +591,6 @@
 #define BUG_TABLE
 #endif
 
-#define JUMP_TABLE                                                      \
-        . = ALIGN(8);                                                   \
-        __jump_table : AT(ADDR(__jump_table) - LOAD_OFFSET) {           \
-                VMLINUX_SYMBOL(__start___jump_table) = .;               \
-                *(__jump_table)                                         \
-                VMLINUX_SYMBOL(__stop___jump_table) = .;                \
-        }
-
 #ifdef CONFIG_PM_TRACE
 #define TRACEDATA                                                       \
         . = ALIGN(4);                                                   \