mm/: remove caller signal_pending branch predictions

This is already done for us internally by the signal machinery.

Link: http://lkml.kernel.org/r/20181116002713.8474-5-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/filemap.c b/mm/filemap.c
index d2df272152f5358a5d3e62b5290d7be1a68a4336..b1165a311a1f56125053496799c2ec9017ca5d03 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1125,7 +1125,7 @@ static inline int wait_on_page_bit_common(wait_queue_head_t *q,
                                break;
                }
 
-               if (unlikely(signal_pending_state(state, current))) {
+               if (signal_pending_state(state, current)) {
                        ret = -EINTR;
                        break;
                }

diff --git a/mm/gup.c b/mm/gup.c
index 8cb68a50dbdf28a27dfaef6dce27e6cdb1f87881..6dd33e16a8063ca21c653cbdf68537ebefdd710c 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -727,7 +727,7 @@ retry:
                 * If we have a pending SIGKILL, don't keep faulting pages and
                 * potentially allocating memory.
                 */
-               if (unlikely(fatal_signal_pending(current))) {
+               if (fatal_signal_pending(current)) {
                        ret = -ERESTARTSYS;
                        goto out;
                }

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 252e81e1f86eaa8ab1521545210658cf552a11e4..1ac3533e8a95d78209ddfee97cb4c16dae1bf36b 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -4244,7 +4244,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 * If we have a pending SIGKILL, don't keep faulting pages and
                 * potentially allocating memory.
                 */
-               if (unlikely(fatal_signal_pending(current))) {
+               if (fatal_signal_pending(current)) {
                        remainder = 0;
                        break;
                }