Merge branch 'linus' into x86/urgent

Merge in the x86 changes to apply a fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index db25707aa41b..6982094a7e74 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -761,6 +761,15 @@ config PANIC_ON_OOPS_VALUE
         default 0 if !PANIC_ON_OOPS
         default 1 if PANIC_ON_OOPS
 
+config PANIC_TIMEOUT
+        int "panic timeout"
+        default 0
+        help
+          Set the timeout value (in seconds) until a reboot occurs when the
+          the kernel panics. If n = 0, then we wait forever. A timeout
+          value n > 0 will wait n seconds before rebooting, while a timeout
+          value n < 0 will reboot immediately.
+
 config SCHED_DEBUG
         bool "Collect scheduler debugging info"
         depends on DEBUG_KERNEL && PROC_FS
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 7473ee3b4ee7..8280a5dd1727 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -82,10 +82,10 @@ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch)
                 unsigned long flags;
                 raw_spin_lock_irqsave(&fbc->lock, flags);
                 fbc->count += count;
+                __this_cpu_sub(*fbc->counters, count - amount);
                 raw_spin_unlock_irqrestore(&fbc->lock, flags);
-                __this_cpu_write(*fbc->counters, 0);
         } else {
-                __this_cpu_write(*fbc->counters, count);
+                this_cpu_add(*fbc->counters, amount);
         }
         preempt_enable();
 }