Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux.git] / kernel / tracepoint.c

diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index df3ade14ccbde53181623c38cad90f3d69bb534b..73956eaff8a9c412177b9a7eeac91d76c3947d5d 100644 (file)
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -55,8 +55,8 @@ struct tp_probes {
 
 static inline void *allocate_probes(int count)
 {
-       struct tp_probes *p  = kmalloc(count * sizeof(struct tracepoint_func)
-                       + sizeof(struct tp_probes), GFP_KERNEL);
+       struct tp_probes *p  = kmalloc(struct_size(p, probes, count),
+                                      GFP_KERNEL);
        return p == NULL ? NULL : p->probes;
 }