Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1239040

[PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON()

Show all headers | View raw

BUG_ON() already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 mm/nommu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/nommu.c b/mm/nommu.c
index 1e0f168..92be862 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -578,16 +578,16 @@ static noinline void validate_nommu_regions(void)
 		return;
 
 	last = rb_entry(lastp, struct vm_region, vm_rb);
-	BUG_ON(unlikely(last->vm_end <= last->vm_start));
-	BUG_ON(unlikely(last->vm_top < last->vm_end));
+	BUG_ON(last->vm_end <= last->vm_start);
+	BUG_ON(last->vm_top < last->vm_end);
 
 	while ((p = rb_next(lastp))) {
 		region = rb_entry(p, struct vm_region, vm_rb);
 		last = rb_entry(lastp, struct vm_region, vm_rb);
 
-		BUG_ON(unlikely(region->vm_end <= region->vm_start));
-		BUG_ON(unlikely(region->vm_top < region->vm_end));
-		BUG_ON(unlikely(region->vm_start < last->vm_top));
+		BUG_ON(region->vm_end <= region->vm_start);
+		BUG_ON(region->vm_top < region->vm_end);
+		BUG_ON(region->vm_start < last->vm_top);
 
 		lastp = p;
 	}
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] scsi: drop unlikely behind BUG_ON() Geliang Tang <geliangtang@163.com> - 2015-10-04 08:20 +0200
  [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Geliang Tang <geliangtang@163.com> - 2015-10-04 08:20 +0200
    Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Leon Romanovsky <leon@leon.nu> - 2015-10-04 13:10 +0200
      Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Davidlohr Bueso <dave@stgolabs.net> - 2015-10-05 04:10 +0200
        Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Leon Romanovsky <leon@leon.nu> - 2015-10-05 10:00 +0200
    Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Davidlohr Bueso <dave@stgolabs.net> - 2015-10-05 04:00 +0200
      Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Geliang Tang <geliangtang@163.com> - 2015-10-05 04:40 +0200
        Re: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Davidlohr Bueso <dave@stgolabs.net> - 2015-10-05 05:40 +0200

csiph-web