From cdda9fe1fb8b7cbe304dcc84b51ac1e041c1f95a Mon Sep 17 00:00:00 2001
From: Burman Yan <yan_952@hotmail.com>
Date: Thu, 7 Dec 2006 02:14:13 +0100
Subject: [PATCH] --- yaml --- r: 43133 b: refs/heads/master c:
 9cfa5b5dfafcfe64c1a48906f243cdd302f82471 h: refs/heads/master i:   43131:
 2a29a76cbdbf32e1a4796aed9e46ef1cd1c8dadd v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/if.c   | 3 +--
 trunk/arch/i386/kernel/cpu/mtrr/main.c | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c20052158db7..6001194e6d82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5d2448d896fbb9a427ee12eb8e5f6309f2473f7
+refs/heads/master: 9cfa5b5dfafcfe64c1a48906f243cdd302f82471
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/if.c b/trunk/arch/i386/kernel/cpu/mtrr/if.c
index 9753bc6a1f3f..5ae1705eafa6 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/if.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/if.c
@@ -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) {
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/main.c b/trunk/arch/i386/kernel/cpu/mtrr/main.c
index aeea23e8a050..16bb7ea87145 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/main.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/main.c
@@ -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++) {