X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Fhwtracing%2Fstm%2Fcore.c;fp=drivers%2Fhwtracing%2Fstm%2Fcore.c;h=e55b902560dee28f854718b72f40ca48803de249;hb=51e0f227812ed81a368de54157ebe14396b4be03;hp=5b5807cbcf7cf052ad6cc5d8817ee6f7adb03b28;hpb=ee496da4c3915de3232b5f5cd20e21ae3e46fe8d;p=linux-2.6-microblaze.git

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index 5b5807cbcf7c..e55b902560de 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -166,11 +166,10 @@ stm_master(struct stm_device *stm, unsigned int idx)
 static int stp_master_alloc(struct stm_device *stm, unsigned int idx)
 {
 	struct stp_master *master;
-	size_t size;
 
-	size = ALIGN(stm->data->sw_nchannels, 8) / 8;
-	size += sizeof(struct stp_master);
-	master = kzalloc(size, GFP_ATOMIC);
+	master = kzalloc(struct_size(master, chan_map,
+				     BITS_TO_LONGS(stm->data->sw_nchannels)),
+			 GFP_ATOMIC);
 	if (!master)
 		return -ENOMEM;