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>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index ce511d8748c..5be1bd4fc7e 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -514,7 +514,7 @@ static struct notifier_block nb = {
         .notifier_call = netevent_callback
 };
 
-static int addr_init(void)
+static int __init addr_init(void)
 {
         addr_wq = create_singlethread_workqueue("ib_addr");
         if (!addr_wq)
@@ -524,7 +524,7 @@ static int addr_init(void)
         return 0;
 }
 
-static void addr_cleanup(void)
+static void __exit addr_cleanup(void)
 {
         unregister_netevent_notifier(&nb);
         destroy_workqueue(addr_wq);
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 851de83ff45..075317884b5 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2960,7 +2960,7 @@ static void cma_remove_one(struct ib_device *device)
         kfree(cma_dev);
 }
 
-static int cma_init(void)
+static int __init cma_init(void)
 {
         int ret, low, high, remaining;
 
@@ -2990,7 +2990,7 @@ err:
         return ret;
 }
 
-static void cma_cleanup(void)
+static void __exit cma_cleanup(void)
 {
         ib_unregister_client(&cma_client);
         unregister_netdevice_notifier(&cma_nb);