Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cfa5b5d authored by Burman Yan's avatar Burman Yan Committed by Andi Kleen
Browse files

[PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code 



Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent d5d2448d

arch/i386/kernel/cpu/mtrr/if.c

+1 −2
Original line number Diff line number Diff line
@@ -44,10 +44,9 @@ mtrr_file_add(unsigned long base, unsigned long size, 


	max = num_var_ranges;

	if (fcount == NULL) {

		fcount = kmalloc(max * sizeof *fcount, GFP_KERNEL);

		fcount = kzalloc(max * sizeof *fcount, GFP_KERNEL);

		if (!fcount)

			return -ENOMEM;

		memset(fcount, 0, max * sizeof *fcount);

		FILE_FCOUNT(file) = fcount;

	}

	if (!page) {

arch/i386/kernel/cpu/mtrr/main.c

+2 −4
Original line number Diff line number Diff line
@@ -596,10 +596,8 @@ static int mtrr_save(struct sys_device * sysdev, pm_message_t state) 
	int i;

	int size = num_var_ranges * sizeof(struct mtrr_value);



	mtrr_state = kmalloc(size,GFP_ATOMIC);

	if (mtrr_state)

		memset(mtrr_state,0,size);

	else

	mtrr_state = kzalloc(size,GFP_ATOMIC);

	if (!mtrr_state)

		return -ENOMEM;



	for (i = 0; i < num_var_ranges; i++) {