| Message ID | 20170116073310.GA7981@dhcp22.suse.cz |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Jan 16, 2017 at 08:33:11AM +0100, Michal Hocko wrote: > On Sat 14-01-17 12:56:32, Leon Romanovsky wrote: > [...] > > Hi Michal, > > > > I don't see mlx5_vzalloc in the changed list. Any reason why did you skip it? > > > > 881 static inline void *mlx5_vzalloc(unsigned long size) > > 882 { > > 883 void *rtn; > > 884 > > 885 rtn = kzalloc(size, GFP_KERNEL | __GFP_NOWARN); > > 886 if (!rtn) > > 887 rtn = vzalloc(size); > > 888 return rtn; > > 889 } > > No reason to skip it, I just didn't see it. I will fold the following in > if you are OK with it Sure, no problem. Once, the patch set is accepted, we (Mellanox) will get rid of mlx5_vzalloc(). Thanks > --- > diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h > index cdd2bd62f86d..5e6063170e48 100644 > --- a/include/linux/mlx5/driver.h > +++ b/include/linux/mlx5/driver.h > @@ -874,12 +874,7 @@ static inline u16 cmdif_rev(struct mlx5_core_dev *dev) > > static inline void *mlx5_vzalloc(unsigned long size) > { > - void *rtn; > - > - rtn = kzalloc(size, GFP_KERNEL | __GFP_NOWARN); > - if (!rtn) > - rtn = vzalloc(size); > - return rtn; > + return kvzalloc(GFP_KERNEL, size); > } > > static inline u32 mlx5_base_mkey(const u32 key) > > -- > Michal Hocko > SUSE Labs > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index cdd2bd62f86d..5e6063170e48 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -874,12 +874,7 @@ static inline u16 cmdif_rev(struct mlx5_core_dev *dev) static inline void *mlx5_vzalloc(unsigned long size) { - void *rtn; - - rtn = kzalloc(size, GFP_KERNEL | __GFP_NOWARN); - if (!rtn) - rtn = vzalloc(size); - return rtn; + return kvzalloc(GFP_KERNEL, size); } static inline u32 mlx5_base_mkey(const u32 key)