2 files changed, 6 insertions, 4 deletions

diff --git a/lib/extable.c b/lib/extable.c
index 463f4560f16d..179c08745595 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -57,10 +57,10 @@ search_extable(const struct exception_table_entry *first,
         while (first <= last) {
                 const struct exception_table_entry *mid;
 
-                mid = (last - first) / 2 + first;
+                mid = ((last - first) >> 1) + first;
                 /*
-                 * careful, the distance between entries can be
-                 * larger than 2GB:
+                 * careful, the distance between value and insn
+                 * can be larger than MAX_LONG:
                  */
                 if (mid->insn < value)
                         first = mid + 1;
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index eddc9b3d3876..6c90fb90e19c 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -42,7 +42,9 @@ unsigned int debug_smp_processor_id(void)
         if (!printk_ratelimit())
                 goto out_enable;
 
-        printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] code: %s/%d\n", preempt_count(), current->comm, current->pid);
+        printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] "
+                        "code: %s/%d\n",
+                        preempt_count() - 1, current->comm, current->pid);
         print_symbol("caller is %s\n", (long)__builtin_return_address(0));
         dump_stack();