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, 7 insertions, 12 deletions

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 63598dca2d0c..09b4ff9711b2 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -26,19 +26,14 @@ static struct kmem_cache *nsproxy_cachep;
 
 struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
 
-/*
- * creates a copy of "orig" with refcount 1.
- */
-static inline struct nsproxy *clone_nsproxy(struct nsproxy *orig)
+static inline struct nsproxy *create_nsproxy(void)
 {
-        struct nsproxy *ns;
+        struct nsproxy *nsproxy;
 
-        ns = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
-        if (ns) {
-                memcpy(ns, orig, sizeof(struct nsproxy));
-                atomic_set(&ns->count, 1);
-        }
-        return ns;
+        nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+        if (nsproxy)
+                atomic_set(&nsproxy->count, 1);
+        return nsproxy;
 }
 
 /*
@@ -52,7 +47,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
         struct nsproxy *new_nsp;
         int err;
 
-        new_nsp = clone_nsproxy(tsk->nsproxy);
+        new_nsp = create_nsproxy();
         if (!new_nsp)
                 return ERR_PTR(-ENOMEM);