From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by kanga.kvack.org (Postfix) with ESMTP id 128BA680DC6 for ; Sun, 4 Oct 2015 02:18:56 -0400 (EDT) Received: by pacex6 with SMTP id ex6so144879113pac.0 for ; Sat, 03 Oct 2015 23:18:55 -0700 (PDT) Received: from m50-132.163.com (m50-132.163.com. [123.125.50.132]) by mx.google.com with ESMTP id wk1si21486202pbc.139.2015.10.03.23.18.50 for ; Sat, 03 Oct 2015 23:18:55 -0700 (PDT) From: Geliang Tang Subject: [PATCH 3/3] mm/nommu: drop unlikely behind BUG_ON() Date: Sun, 4 Oct 2015 14:18:03 +0800 Message-Id: <45bf632d263280847a2a894017c62b7f2a71eda1.1443937856.git.geliangtang@163.com> In-Reply-To: References: In-Reply-To: References: Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , "Kirill A. Shutemov" , Hugh Dickins , "Peter Zijlstra (Intel)" , Andrea Arcangeli , Davidlohr Bueso , Joonsoo Kim , Arnd Bergmann , Paul Gortmaker , Leon Romanovsky , Oleg Nesterov Cc: Geliang Tang , linux-mm@kvack.org, linux-kernel@vger.kernel.org BUG_ON() already contain an unlikely compiler flag. Drop it. Signed-off-by: Geliang Tang --- 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org