netfilter: nf_conntrack: per netns nf_conntrack_cachep

[safe/jmp/linux-2.6] / include / linux / textsearch.h

diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
index 6c34cf2..d9a85d6 100644 (file)
--- a/include/linux/textsearch.h
+++ b/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;
 }