6 files changed, 26 insertions, 17 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7e2e7dd4cd2f..2734eca59243 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -109,10 +109,9 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
         spin_lock_irqsave(&desc->lock, flags);
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
-        if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) {
-                cpumask_copy(desc->affinity, cpumask);
+        if (desc->status & IRQ_MOVE_PCNTXT)
                 desc->chip->set_affinity(irq, cpumask);
-        } else {
+        else {
                 desc->status |= IRQ_MOVE_PENDING;
                 cpumask_copy(desc->pending_mask, cpumask);
         }
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index b0f011866969..accb40cdb12a 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2490,13 +2490,20 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
 void lockdep_init_map(struct lockdep_map *lock, const char *name,
                       struct lock_class_key *key, int subclass)
 {
-        if (unlikely(!debug_locks))
+        lock->class_cache = NULL;
+#ifdef CONFIG_LOCK_STAT
+        lock->cpu = raw_smp_processor_id();
+#endif
+
+        if (DEBUG_LOCKS_WARN_ON(!name)) {
+                lock->name = "NULL";
                 return;
+        }
+
+        lock->name = name;
 
         if (DEBUG_LOCKS_WARN_ON(!key))
                 return;
-        if (DEBUG_LOCKS_WARN_ON(!name))
-                return;
         /*
          * Sanity check, the lock-class key must be persistent:
          */
@@ -2505,12 +2512,11 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name,
                 DEBUG_LOCKS_WARN_ON(1);
                 return;
         }
-        lock->name = name;
         lock->key = key;
-        lock->class_cache = NULL;
-#ifdef CONFIG_LOCK_STAT
-        lock->cpu = raw_smp_processor_id();
-#endif
+
+        if (unlikely(!debug_locks))
+                return;
+
         if (subclass)
                 register_lock_class(lock, subclass, 1);
 }
diff --git a/kernel/panic.c b/kernel/panic.c
index 934fb377f4b3..3dcaa1661357 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -221,7 +221,7 @@ void add_taint(unsigned flag)
          * post-warning case.
          */
         if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
-                printk(KERN_WARNING "Disabling lockdep due to kernel taint\n");
+                printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
 
         set_bit(flag, &tainted_mask);
 }
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index dfcd83ceee3b..0692ab5a0d67 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -188,7 +188,7 @@ int ptrace_attach(struct task_struct *task)
         /* Protect exec's credential calculations against our interference;
          * SUID, SGID and LSM creds get determined differently under ptrace.
          */
-        retval = mutex_lock_interruptible(&current->cred_exec_mutex);
+        retval = mutex_lock_interruptible(&task->cred_exec_mutex);
         if (retval  < 0)
                 goto out;
 
@@ -232,7 +232,7 @@ repeat:
 bad:
         write_unlock_irqrestore(&tasklist_lock, flags);
         task_unlock(task);
-        mutex_unlock(&current->cred_exec_mutex);
+        mutex_unlock(&task->cred_exec_mutex);
 out:
         return retval;
 }
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index ecfd7b5187e0..80189f6f1c5a 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -402,9 +402,6 @@ int clocksource_register(struct clocksource *c)
         unsigned long flags;
         int ret;
 
-        /* save mult_orig on registration */
-        c->mult_orig = c->mult;
-
         spin_lock_irqsave(&clocksource_lock, flags);
         ret = clocksource_enqueue(c);
         if (!ret)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 687dff49f6e7..e97c50f8458b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -77,6 +77,10 @@ static void clocksource_forward_now(void)
         clock->cycle_last = cycle_now;
 
         nsec = cyc2ns(clock, cycle_delta);
+
+        /* If arch requires, add in gettimeoffset() */
+        nsec += arch_gettimeoffset();
+
         timespec_add_ns(&xtime, nsec);
 
         nsec = ((s64)cycle_delta * clock->mult_orig) >> clock->shift;
@@ -111,6 +115,9 @@ void getnstimeofday(struct timespec *ts)
                 /* convert to nanoseconds: */
                 nsecs = cyc2ns(clock, cycle_delta);
 
+                /* If arch requires, add in gettimeoffset() */
+                nsecs += arch_gettimeoffset();
+
         } while (read_seqretry(&xtime_lock, seq));
 
         timespec_add_ns(ts, nsecs);