Merge branch 'linus'

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index 766b6c05c6db..2bed290fec76 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -357,10 +357,8 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
-                memset(as, 0, sizeof(*as));
-
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
                  * process accounting. If the device is opened by root, we