3 files changed, 11 insertions, 16 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 8ca1a14cdc8c..8dd8ff281009 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1292,23 +1292,14 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                         __ptrace_link(p, current->parent);
 
                 if (thread_group_leader(p)) {
-                        if (clone_flags & CLONE_NEWPID) {
+                        if (clone_flags & CLONE_NEWPID)
                                 p->nsproxy->pid_ns->child_reaper = p;
-                                p->signal->tty = NULL;
-                                set_task_pgrp(p, p->pid);
-                                set_task_session(p, p->pid);
-                                attach_pid(p, PIDTYPE_PGID, pid);
-                                attach_pid(p, PIDTYPE_SID, pid);
-                        } else {
-                                p->signal->tty = current->signal->tty;
-                                set_task_pgrp(p, task_pgrp_nr(current));
-                                set_task_session(p, task_session_nr(current));
-                                attach_pid(p, PIDTYPE_PGID,
-                                                task_pgrp(current));
-                                attach_pid(p, PIDTYPE_SID,
-                                                task_session(current));
-                        }
 
+                        p->signal->tty = current->signal->tty;
+                        set_task_pgrp(p, task_pgrp_nr(current));
+                        set_task_session(p, task_session_nr(current));
+                        attach_pid(p, PIDTYPE_PGID, task_pgrp(current));
+                        attach_pid(p, PIDTYPE_SID, task_session(current));
                         list_add_tail_rcu(&p->tasks, &init_task.tasks);
                         __get_cpu_var(process_counts)++;
                 }
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 0deed82a6156..8ac51714b08c 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1588,6 +1588,10 @@ struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
 void unregister_sysctl_table(struct ctl_table_header * header)
 {
         might_sleep();
+
+        if (header == NULL)
+                return;
+
         spin_lock(&sysctl_lock);
         start_unregistering(header);
         spin_unlock(&sysctl_lock);
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 6972f26c65f7..bed939f82c31 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -96,7 +96,7 @@ static struct trans_ctl_table trans_kern_table[] = {
 
         { KERN_PTY,                     "pty",          trans_pty_table },
         { KERN_NGROUPS_MAX,             "ngroups_max" },
-        { KERN_SPARC_SCONS_PWROFF,      "scons_poweroff" },
+        { KERN_SPARC_SCONS_PWROFF,      "scons-poweroff" },
         { KERN_HZ_TIMER,                "hz_timer" },
         { KERN_UNKNOWN_NMI_PANIC,       "unknown_nmi_panic" },
         { KERN_BOOTLOADER_TYPE,         "bootloader_type" },