diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/memory.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 785cb6e6b91c..b7ddd651d664 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -340,15 +340,12 @@ static int memory_probe_init(void) | |||
340 | static int add_memory_block(unsigned long node_id, struct mem_section *section, | 340 | static int add_memory_block(unsigned long node_id, struct mem_section *section, |
341 | unsigned long state, int phys_device) | 341 | unsigned long state, int phys_device) |
342 | { | 342 | { |
343 | size_t size = sizeof(struct memory_block); | 343 | struct memory_block *mem = kzalloc(sizeof(*mem), GFP_KERNEL); |
344 | struct memory_block *mem = kmalloc(size, GFP_KERNEL); | ||
345 | int ret = 0; | 344 | int ret = 0; |
346 | 345 | ||
347 | if (!mem) | 346 | if (!mem) |
348 | return -ENOMEM; | 347 | return -ENOMEM; |
349 | 348 | ||
350 | memset(mem, 0, size); | ||
351 | |||
352 | mem->phys_index = __section_nr(section); | 349 | mem->phys_index = __section_nr(section); |
353 | mem->state = state; | 350 | mem->state = state; |
354 | init_MUTEX(&mem->state_sem); | 351 | init_MUTEX(&mem->state_sem); |