git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwmon: Request the I/O regions in platform drivers
[safe/jmp/linux-2.6]
/
mm
/
mempolicy.c
diff --git
a/mm/mempolicy.c
b/mm/mempolicy.c
index
c2aec0e
..
d76e8eb
100644
(file)
--- a/
mm/mempolicy.c
+++ b/
mm/mempolicy.c
@@
-105,7
+105,7
@@
static struct kmem_cache *sn_cache;
/* Highest zone. An specific allocation for a zone below that is not
policied. */
/* Highest zone. An specific allocation for a zone below that is not
policied. */
-enum zone_type policy_zone =
ZONE_DMA
;
+enum zone_type policy_zone =
0
;
struct mempolicy default_policy = {
.refcnt = ATOMIC_INIT(1), /* never free it */
struct mempolicy default_policy = {
.refcnt = ATOMIC_INIT(1), /* never free it */
@@
-144,7
+144,7
@@
static struct zonelist *bind_zonelist(nodemask_t *nodes)
max++; /* space for zlcache_ptr (see mmzone.h) */
zl = kmalloc(sizeof(struct zone *) * max, GFP_KERNEL);
if (!zl)
max++; /* space for zlcache_ptr (see mmzone.h) */
zl = kmalloc(sizeof(struct zone *) * max, GFP_KERNEL);
if (!zl)
- return
NULL
;
+ return
ERR_PTR(-ENOMEM)
;
zl->zlcache_ptr = NULL;
num = 0;
/* First put in the highest zones from all nodes, then all the next
zl->zlcache_ptr = NULL;
num = 0;
/* First put in the highest zones from all nodes, then all the next
@@
-162,6
+162,10
@@
static struct zonelist *bind_zonelist(nodemask_t *nodes)
break;
k--;
}
break;
k--;
}
+ if (num == 0) {
+ kfree(zl);
+ return ERR_PTR(-EINVAL);
+ }
zl->zones[num] = NULL;
return zl;
}
zl->zones[num] = NULL;
return zl;
}
@@
-193,9
+197,10
@@
static struct mempolicy *mpol_new(int mode, nodemask_t *nodes)
break;
case MPOL_BIND:
policy->v.zonelist = bind_zonelist(nodes);
break;
case MPOL_BIND:
policy->v.zonelist = bind_zonelist(nodes);
- if (policy->v.zonelist == NULL) {
+ if (IS_ERR(policy->v.zonelist)) {
+ void *error_code = policy->v.zonelist;
kmem_cache_free(policy_cache, policy);
kmem_cache_free(policy_cache, policy);
- return
ERR_PTR(-ENOMEM)
;
+ return
error_code
;
}
break;
}
}
break;
}
@@
-316,15
+321,6
@@
static inline int check_pgd_range(struct vm_area_struct *vma,
return 0;
}
return 0;
}
-/* Check if a vma is migratable */
-static inline int vma_migratable(struct vm_area_struct *vma)
-{
- if (vma->vm_flags & (
- VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED))
- return 0;
- return 1;
-}
-
/*
* Check if all pages in a range are on a set of nodes.
* If pagelist != NULL then isolate pages from the LRU and
/*
* Check if all pages in a range are on a set of nodes.
* If pagelist != NULL then isolate pages from the LRU and
@@
-1667,7
+1663,7
@@
void mpol_rebind_policy(struct mempolicy *pol, const nodemask_t *newmask)
* then zonelist_policy() will "FALL THROUGH" to MPOL_DEFAULT.
*/
* then zonelist_policy() will "FALL THROUGH" to MPOL_DEFAULT.
*/
- if (
zonelist
) {
+ if (
!IS_ERR(zonelist)
) {
/* Good - got mem - substitute new zonelist */
kfree(pol->v.zonelist);
pol->v.zonelist = zonelist;
/* Good - got mem - substitute new zonelist */
kfree(pol->v.zonelist);
pol->v.zonelist = zonelist;