|
@@ -2813,7 +2813,7 @@ static struct swap_info_struct *alloc_swap_info(void)
|
|
|
unsigned int type;
|
|
|
int i;
|
|
|
|
|
|
- p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
|
+ p = kvzalloc(sizeof(*p), GFP_KERNEL);
|
|
|
if (!p)
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
@@ -2824,7 +2824,7 @@ static struct swap_info_struct *alloc_swap_info(void)
|
|
|
}
|
|
|
if (type >= MAX_SWAPFILES) {
|
|
|
spin_unlock(&swap_lock);
|
|
|
- kfree(p);
|
|
|
+ kvfree(p);
|
|
|
return ERR_PTR(-EPERM);
|
|
|
}
|
|
|
if (type >= nr_swapfiles) {
|
|
@@ -2838,7 +2838,7 @@ static struct swap_info_struct *alloc_swap_info(void)
|
|
|
smp_wmb();
|
|
|
nr_swapfiles++;
|
|
|
} else {
|
|
|
- kfree(p);
|
|
|
+ kvfree(p);
|
|
|
p = swap_info[type];
|
|
|
/*
|
|
|
* Do not memset this entry: a racing procfs swap_next()
|