diff --git a/[refs] b/[refs] index 2d239c87789b..3ea71370efb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 120b286d3c94a4e59fdb8069d42e8d49ea468ffd +refs/heads/master: 5eb1d63f5fc8455269c2756223b3cf3779fd2f7a diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c index e4dfda1eb7dd..6dba2d63f24d 100644 --- a/trunk/arch/ia64/kernel/setup.c +++ b/trunk/arch/ia64/kernel/setup.c @@ -260,6 +260,7 @@ reserve_memory (void) n++; num_rsvd_regions = n; + BUG_ON(IA64_MAX_RSVD_REGIONS + 1 < n); sort_regions(rsvd_region, num_rsvd_regions); }