From 556816c20ed2097ad0aeda3c583b67c4802d9cf5 Mon Sep 17 00:00:00 2001 From: Joonwoo Park Date: Tue, 8 Jul 2008 02:38:40 -0700 Subject: [PATCH] --- yaml --- r: 103330 b: refs/heads/master c: dde77e604497dada6f224a685278dfb27747ae52 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/textsearch.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 67c18783954b..313d101c926e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43138833ee9af07e865a4dcbfe81684c9c2f2262 +refs/heads/master: dde77e604497dada6f224a685278dfb27747ae52 diff --git a/trunk/include/linux/textsearch.h b/trunk/include/linux/textsearch.h index 6c34cf28b7aa..d9a85d616385 100644 --- a/trunk/include/linux/textsearch.h +++ b/trunk/include/linux/textsearch.h @@ -162,11 +162,10 @@ static inline struct ts_config *alloc_ts_config(size_t payload, { struct ts_config *conf; - conf = kmalloc(TS_PRIV_ALIGN(sizeof(*conf)) + payload, gfp_mask); + conf = kzalloc(TS_PRIV_ALIGN(sizeof(*conf)) + payload, gfp_mask); if (conf == NULL) return ERR_PTR(-ENOMEM); - memset(conf, 0, TS_PRIV_ALIGN(sizeof(*conf)) + payload); return conf; }