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

Leon Romanovsky
2015-10-04T11:03:01Z

On Sun, Oct 4, 2015 at 9:18 AM, Geliang Tang <geliangtang@163.com> wrote:
> BUG_ON() already contain an unlikely compiler flag. Drop it.
It is not the case if CONFIG_BUG and HAVE_ARCH_BUG_ON are not set.

>
> 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, 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

--
Leon Romanovsky | Independent Linux Consultant
www.leon.nu | leon@leon.nu