Merge branch 'linus' into tracing/hw-branch-tracing

2 files changed, 9 insertions, 5 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 8185a0f0959..2606d0fb4e5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1024,7 +1024,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
                 if (ret == -EBUSY) {
                         mutex_unlock(&cgroup_mutex);
                         mutex_unlock(&inode->i_mutex);
-                        goto drop_new_super;
+                        goto free_cg_links;
                 }
 
                 /* EBUSY should be the only error here */
@@ -1073,10 +1073,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
 
         return simple_set_mnt(mnt, sb);
 
+ free_cg_links:
+        free_cg_links(&tmp_cg_links);
  drop_new_super:
         up_write(&sb->s_umount);
         deactivate_super(sb);
-        free_cg_links(&tmp_cg_links);
         return ret;
 }
 
@@ -2934,9 +2935,6 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys,
  again:
         root = subsys->root;
         if (root == &rootnode) {
-                printk(KERN_INFO
-                       "Not cloning cgroup for unused subsystem %s\n",
-                       subsys->name);
                 mutex_unlock(&cgroup_mutex);
                 return 0;
         }
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 5e79c662294..a140e44eebb 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -197,6 +197,11 @@ static int common_timer_create(struct k_itimer *new_timer)
         return 0;
 }
 
+static int no_timer_create(struct k_itimer *new_timer)
+{
+        return -EOPNOTSUPP;
+}
+
 /*
  * Return nonzero if we know a priori this clockid_t value is bogus.
  */
@@ -248,6 +253,7 @@ static __init int init_posix_timers(void)
                 .clock_getres = hrtimer_get_res,
                 .clock_get = posix_get_monotonic_raw,
                 .clock_set = do_posix_clock_nosettime,
+                .timer_create = no_timer_create,
         };
 
         register_posix_clock(CLOCK_REALTIME, &clock_realtime);