Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

2 files changed, 14 insertions, 2 deletions

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 0f6dabd4b517..12c07c1866b2 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -41,7 +41,7 @@ extern void warn_slowpath(const char *file, const int line,
 #define __WARN() warn_on_slowpath(__FILE__, __LINE__)
 #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg)
 #else
-#define __WARN_printf(arg...) __WARN()
+#define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0)
 #endif
 
 #ifndef WARN_ON
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 74c5faf26c05..80744606bad1 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -37,6 +37,13 @@
 #define MEM_DISCARD(sec) *(.mem##sec)
 #endif
 
+#ifdef CONFIG_FTRACE_MCOUNT_RECORD
+#define MCOUNT_REC()    VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+                        *(__mcount_loc)                         \
+                        VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+#else
+#define MCOUNT_REC()
+#endif
 
 /* .data section */
 #define DATA_DATA                                                       \
@@ -52,7 +59,10 @@
         . = ALIGN(8);                                                   \
         VMLINUX_SYMBOL(__start___markers) = .;                          \
         *(__markers)                                                    \
-        VMLINUX_SYMBOL(__stop___markers) = .;
+        VMLINUX_SYMBOL(__stop___markers) = .;                           \
+        VMLINUX_SYMBOL(__start___tracepoints) = .;                      \
+        *(__tracepoints)                                                \
+        VMLINUX_SYMBOL(__stop___tracepoints) = .;
 
 #define RO_DATA(align)                                                  \
         . = ALIGN((align));                                             \
@@ -61,6 +71,7 @@
                 *(.rodata) *(.rodata.*)                                 \
                 *(__vermagic)           /* Kernel version magic */      \
                 *(__markers_strings)    /* Markers: strings */          \
+                *(__tracepoints_strings)/* Tracepoints: strings */      \
         }                                                               \
                                                                         \
         .rodata1          : AT(ADDR(.rodata1) - LOAD_OFFSET) {          \
@@ -188,6 +199,7 @@
         /* __*init sections */                                          \
         __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {         \
                 *(.ref.rodata)                                          \
+                MCOUNT_REC()                                            \
                 DEV_KEEP(init.rodata)                                   \
                 DEV_KEEP(exit.rodata)                                   \
                 CPU_KEEP(init.rodata)                                   \