Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.

4 files changed, 21 insertions, 4 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 21a4e3b2cbda..e0d296c5b302 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -636,6 +636,23 @@ static void update_cpu_domains(struct cpuset *cur)
                 return;
 
         /*
+         * Hack to avoid 2.6.13 partial node dynamic sched domain bug.
+         * Require the 'cpu_exclusive' cpuset to include all (or none)
+         * of the CPUs on each node, or return w/o changing sched domains.
+         * Remove this hack when dynamic sched domains fixed.
+         */
+        {
+                int i, j;
+
+                for_each_cpu_mask(i, cur->cpus_allowed) {
+                        for_each_cpu_mask(j, node_to_cpumask(cpu_to_node(i))) {
+                                if (!cpu_isset(j, cur->cpus_allowed))
+                                        return;
+                        }
+                }
+        }
+
+        /*
          * Get all cpus from parent's cpus_allowed not part of exclusive
          * children
          */
diff --git a/kernel/sched.c b/kernel/sched.c
index a646e4f36c41..5f889d0cbfcc 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3378,8 +3378,8 @@ EXPORT_SYMBOL(set_user_nice);
  */
 int can_nice(const task_t *p, const int nice)
 {
-        /* convert nice value [19,-20] to rlimit style value [0,39] */
-        int nice_rlim = 19 - nice;
+        /* convert nice value [19,-20] to rlimit style value [1,40] */
+        int nice_rlim = 20 - nice;
         return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
                 capable(CAP_SYS_NICE));
 }
diff --git a/kernel/signal.c b/kernel/signal.c
index ca1186eef938..d282fea81138 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -692,7 +692,7 @@ static void handle_stop_signal(int sig, struct task_struct *p)
 {
         struct task_struct *t;
 
-        if (p->flags & SIGNAL_GROUP_EXIT)
+        if (p->signal->flags & SIGNAL_GROUP_EXIT)
                 /*
                  * The process is in the middle of dying already.
                  */
diff --git a/kernel/timer.c b/kernel/timer.c
index f2a11887a726..5377f40723ff 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1023,7 +1023,7 @@ asmlinkage long sys_getppid(void)
         parent = me->group_leader->real_parent;
         for (;;) {
                 pid = parent->tgid;
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 {
                 struct task_struct *old = parent;