Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / arch / x86 / kernel / nmi.c

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 0920212e6159a27b552925e7f26d5efa584d0440..ba77ebc2c35321dc4085c06a106f715ec18d9a21 100644 (file)
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -111,7 +111,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
         */
        list_for_each_entry_rcu(a, &desc->head, list) {
                u64 before, delta, whole_msecs;
-               int decimal_msecs, thishandled;
+               int remainder_ns, decimal_msecs, thishandled;
 
                before = local_clock();
                thishandled = a->handler(type, regs);
@@ -123,8 +123,9 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
                        continue;
 
                nmi_longest_ns = delta;
-               whole_msecs = do_div(delta, (1000 * 1000));
-               decimal_msecs = do_div(delta, 1000) % 1000;
+               whole_msecs = delta;
+               remainder_ns = do_div(whole_msecs, (1000 * 1000));
+               decimal_msecs = remainder_ns / 1000;
                printk_ratelimited(KERN_INFO
                        "INFO: NMI handler (%ps) took too long to run: "
                        "%lld.%03d msecs\n", a->handler, whole_msecs,