Commit 662f3a0b94cc92bd708c27b80f8207cd7db93204

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent dfcd3c0dc4

[PATCH] Remove near all BUGs in mm/mempolicy.c

Most of them can never be triggered and were only for development.

Signed-off-by: "Andi Kleen" <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

... ... @@ -185,7 +185,6 @@
185 185 policy_zone = k;
186 186 }
187 187 }
188   - BUG_ON(num >= max);
189 188 zl->zones[num] = NULL;
190 189 return zl;
191 190 }
... ... @@ -709,7 +708,6 @@
709 708 struct task_struct *me = current;
710 709  
711 710 nid = me->il_next;
712   - BUG_ON(nid >= MAX_NUMNODES);
713 711 next = next_node(nid, policy->v.nodes);
714 712 if (next >= MAX_NUMNODES)
715 713 next = first_node(policy->v.nodes);
716 714  
717 715  
... ... @@ -731,18 +729,17 @@
731 729 nid = next_node(nid, pol->v.nodes);
732 730 c++;
733 731 } while (c <= target);
734   - BUG_ON(nid >= MAX_NUMNODES);
735 732 return nid;
736 733 }
737 734  
738 735 /* Allocate a page in interleaved policy.
739 736 Own path because it needs to do special accounting. */
740   -static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, unsigned nid)
  737 +static struct page *alloc_page_interleave(gfp_t gfp, unsigned order,
  738 + unsigned nid)
741 739 {
742 740 struct zonelist *zl;
743 741 struct page *page;
744 742  
745   - BUG_ON(!node_online(nid));
746 743 zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp);
747 744 page = __alloc_pages(gfp, order, zl);
748 745 if (page && page_zone(page) == zl->zones[0]) {
... ... @@ -785,8 +782,6 @@
785 782 unsigned nid;
786 783 if (vma) {
787 784 unsigned long off;
788   - BUG_ON(addr >= vma->vm_end);
789   - BUG_ON(addr < vma->vm_start);
790 785 off = vma->vm_pgoff;
791 786 off += (addr - vma->vm_start) >> PAGE_SHIFT;
792 787 nid = offset_il_node(pol, vma, off);