Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11322
b: refs/heads/master
c: 662f3a0
h: refs/heads/master
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Oct 30, 2005
1 parent 95fa793 commit efdefa5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfcd3c0dc426bb75770c34b40e14f2da8845ea62
refs/heads/master: 662f3a0b94cc92bd708c27b80f8207cd7db93204
9 changes: 2 additions & 7 deletions trunk/mm/mempolicy.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ static struct zonelist *bind_zonelist(nodemask_t *nodes)
policy_zone = k;
}
}
BUG_ON(num >= max);
zl->zones[num] = NULL;
return zl;
}
Expand Down Expand Up @@ -709,7 +708,6 @@ static unsigned interleave_nodes(struct mempolicy *policy)
struct task_struct *me = current;

nid = me->il_next;
BUG_ON(nid >= MAX_NUMNODES);
next = next_node(nid, policy->v.nodes);
if (next >= MAX_NUMNODES)
next = first_node(policy->v.nodes);
Expand All @@ -731,18 +729,17 @@ static unsigned offset_il_node(struct mempolicy *pol,
nid = next_node(nid, pol->v.nodes);
c++;
} while (c <= target);
BUG_ON(nid >= MAX_NUMNODES);
return nid;
}

/* Allocate a page in interleaved policy.
Own path because it needs to do special accounting. */
static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, unsigned nid)
static struct page *alloc_page_interleave(gfp_t gfp, unsigned order,
unsigned nid)
{
struct zonelist *zl;
struct page *page;

BUG_ON(!node_online(nid));
zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp);
page = __alloc_pages(gfp, order, zl);
if (page && page_zone(page) == zl->zones[0]) {
Expand Down Expand Up @@ -785,8 +782,6 @@ alloc_page_vma(gfp_t gfp, struct vm_area_struct *vma, unsigned long addr)
unsigned nid;
if (vma) {
unsigned long off;
BUG_ON(addr >= vma->vm_end);
BUG_ON(addr < vma->vm_start);
off = vma->vm_pgoff;
off += (addr - vma->vm_start) >> PAGE_SHIFT;
nid = offset_il_node(pol, vma, off);
Expand Down

0 comments on commit efdefa5

Please sign in to comment.