Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

7 files changed, 50 insertions, 16 deletions

diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 0669b70fa6a3..9fdba03dc1fc 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -52,8 +52,23 @@ config PREEMPT
 
 endchoice
 
+config PREEMPT_RCU
+        bool "Preemptible RCU"
+        depends on PREEMPT
+        default n
+        help
+          This option reduces the latency of the kernel by making certain
+          RCU sections preemptible. Normally RCU code is non-preemptible, if
+          this option is selected then read-only RCU sections become
+          preemptible. This helps latency, but may expose bugs due to
+          now-naive assumptions about each RCU read-side critical section
+          remaining on a given CPU through its execution.
+
+          Say N if you are unsure.
+
 config RCU_TRACE
         bool "Enable tracing for RCU - currently stats in debugfs"
+        depends on PREEMPT_RCU
         select DEBUG_FS
         default y
         help
diff --git a/kernel/exit.c b/kernel/exit.c
index cd20bf07e9e3..53872bf993fa 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1378,7 +1378,7 @@ unlock_sig:
         if (!retval && infop)
                 retval = put_user(0, &infop->si_errno);
         if (!retval && infop)
-                retval = put_user(why, &infop->si_code);
+                retval = put_user((short)why, &infop->si_code);
         if (!retval && infop)
                 retval = put_user(exit_code, &infop->si_status);
         if (!retval && infop)
diff --git a/kernel/module.c b/kernel/module.c
index be4807fb90e4..5d437bffd8dc 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2178,10 +2178,20 @@ sys_init_module(void __user *umod,
                 wake_up(&module_wq);
                 return ret;
         }
+        if (ret > 0) {
+                printk(KERN_WARNING "%s: '%s'->init suspiciously returned %d, "
+                                    "it should follow 0/-E convention\n"
+                       KERN_WARNING "%s: loading module anyway...\n",
+                       __func__, mod->name, ret,
+                       __func__);
+                dump_stack();
+        }
 
-        /* Now it's a first class citizen! */
-        mutex_lock(&module_mutex);
+        /* Now it's a first class citizen!  Wake up anyone waiting for it. */
         mod->state = MODULE_STATE_LIVE;
+        wake_up(&module_wq);
+
+        mutex_lock(&module_mutex);
         /* Drop initial reference. */
         module_put(mod);
         unwind_remove_table(mod->unwind_info, 1);
@@ -2190,7 +2200,6 @@ sys_init_module(void __user *umod,
         mod->init_size = 0;
         mod->init_text_size = 0;
         mutex_unlock(&module_mutex);
-        wake_up(&module_wq);
 
         return 0;
 }
diff --git a/kernel/sched.c b/kernel/sched.c
index 52b98675acb2..1cb53fb1fe3d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5881,7 +5881,8 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
                 spin_unlock_irq(&rq->lock);
                 break;
 
-        case CPU_DOWN_PREPARE:
+        case CPU_DYING:
+        case CPU_DYING_FROZEN:
                 /* Update our root-domain */
                 rq = cpu_rq(cpu);
                 spin_lock_irqsave(&rq->lock, flags);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index c88b5910e7ab..5fd9b9469770 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -42,12 +42,13 @@ long time_esterror = NTP_PHASE_LIMIT;	/* estimated error (us)		*/
 long time_freq;                         /* frequency offset (scaled ppm)*/
 static long time_reftime;               /* time at last adjustment (s)  */
 long time_adjust;
+static long ntp_tick_adj;
 
 static void ntp_update_frequency(void)
 {
         u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
                                 << TICK_LENGTH_SHIFT;
-        second_length += (s64)CLOCK_TICK_ADJUST << TICK_LENGTH_SHIFT;
+        second_length += (s64)ntp_tick_adj << TICK_LENGTH_SHIFT;
         second_length += (s64)time_freq << (TICK_LENGTH_SHIFT - SHIFT_NSEC);
 
         tick_length_base = second_length;
@@ -342,14 +343,16 @@ int do_adjtimex(struct timex *txc)
                     freq_adj = shift_right(freq_adj, time_constant * 2 +
                                            (SHIFT_PLL + 2) * 2 - SHIFT_NSEC);
                     if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
+                        u64 utemp64;
                         temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL);
                         if (time_offset < 0) {
-                            temp64 = -temp64;
-                            do_div(temp64, mtemp);
-                            freq_adj -= temp64;
+                            utemp64 = -temp64;
+                            do_div(utemp64, mtemp);
+                            freq_adj -= utemp64;
                         } else {
-                            do_div(temp64, mtemp);
-                            freq_adj += temp64;
+                            utemp64 = temp64;
+                            do_div(utemp64, mtemp);
+                            freq_adj += utemp64;
                         }
                     }
                     freq_adj += time_freq;
@@ -400,3 +403,11 @@ leave:	if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0)
         notify_cmos_timer();
         return(result);
 }
+
+static int __init ntp_tick_adj_setup(char *str)
+{
+        ntp_tick_adj = simple_strtol(str, NULL, 0);
+        return 1;
+}
+
+__setup("ntp_tick_adj=", ntp_tick_adj_setup);
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 2968298f8f36..686da821d376 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu)
 
         if (ts->sched_timer.base)
                 hrtimer_cancel(&ts->sched_timer);
-        ts->tick_stopped = 0;
+
         ts->nohz_mode = NOHZ_MODE_INACTIVE;
 }
 #endif /* HIGH_RES_TIMERS */
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 1af9fb050fe2..671af612b768 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -187,8 +187,7 @@ static void change_clocksource(void)
 
         clock->error = 0;
         clock->xtime_nsec = 0;
-        clocksource_calculate_interval(clock,
-                (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
 
         tick_clock_notify();
 
@@ -245,8 +244,7 @@ void __init timekeeping_init(void)
         ntp_clear();
 
         clock = clocksource_get_next();
-        clocksource_calculate_interval(clock,
-                (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
         clock->cycle_last = clocksource_read(clock);
 
         xtime.tv_sec = sec;