Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
	arch/Kconfig
	kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index 8ae807ab7a51..d34d38dcd12c 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -62,7 +62,8 @@ SECTIONS {
 
         _sdata = . ;
         .data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */
-                *(.data)
+                DATA_DATA
+                CONSTRUCTORS
         }
         . = ALIGN(32);
         .data.cacheline_aligned : { *(.data.cacheline_aligned) }
@@ -98,13 +99,13 @@ SECTIONS {
         . = ALIGN(4096);
         .init.text : {
                 _sinittext = . ;
-                *(.init.text)
-                *(.exit.text)
-                *(.exit.data)
+                INIT_TEXT
                 _einittext = .;
         }
 
-        .init.data : { *(.init.data) }
+        .init.data : {
+                INIT_DATA
+        }
 
         . = ALIGN(4);
         .init.ivt : {