5 files changed, 7 insertions, 8 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index a08a17218d..8dc24c92dc 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2602,7 +2602,7 @@ out_restore:
         raw_local_irq_restore(flags);
 }
 
-void __init lockdep_init(void)
+void lockdep_init(void)
 {
         int i;
 
diff --git a/kernel/relay.c b/kernel/relay.c
index ef8a935710..577f251c7e 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -474,13 +474,12 @@ static void setup_callbacks(struct rchan *chan,
 }
 
 /**
- *
  *      relay_hotcpu_callback - CPU hotplug callback
  *      @nb: notifier block
  *      @action: hotplug action to take
  *      @hcpu: CPU number
  *
- *      Returns the success/failure of the operation. (NOTIFY_OK, NOTIFY_BAD)
+ *      Returns the success/failure of the operation. (%NOTIFY_OK, %NOTIFY_BAD)
  */
 static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
                                 unsigned long action,
diff --git a/kernel/sched.c b/kernel/sched.c
index 0dc757246d..5f102e6c7a 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3547,7 +3547,7 @@ need_resched_nonpreemptible:
                 }
         }
         next->sleep_type = SLEEP_NORMAL;
-        if (dependent_sleeper(cpu, rq, next))
+        if (rq->nr_running == 1 && dependent_sleeper(cpu, rq, next))
                 next = rq->idle;
 switch_tasks:
         if (next == rq->idle)
@@ -3566,7 +3566,7 @@ switch_tasks:
 
         sched_info_switch(prev, next);
         if (likely(prev != next)) {
-                next->timestamp = now;
+                next->timestamp = next->last_ran = now;
                 rq->nr_switches++;
                 rq->curr = next;
                 ++*switch_count;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 3ca1d5ff03..34b2301276 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1359,8 +1359,7 @@ void unregister_sysctl_table(struct ctl_table_header * header)
 }
 
 #else /* !CONFIG_SYSCTL */
-struct ctl_table_header * register_sysctl_table(ctl_table * table,
-                                                int insert_at_head)
+struct ctl_table_header *register_sysctl_table(ctl_table * table)
 {
         return NULL;
 }
diff --git a/kernel/timer.c b/kernel/timer.c
index cb1b86a9c5..6663a87f73 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -711,6 +711,7 @@ static unsigned long cmp_next_hrtimer_event(unsigned long now,
 
 /**
  * next_timer_interrupt - return the jiffy of the next pending timer
+ * @now: current time (in jiffies)
  */
 unsigned long get_next_timer_interrupt(unsigned long now)
 {
@@ -908,7 +909,7 @@ static inline void change_clocksource(void) { }
 #endif
 
 /**
- * timeofday_is_continuous - check to see if timekeeping is free running
+ * timekeeping_is_continuous - check to see if timekeeping is free running
  */
 int timekeeping_is_continuous(void)
 {