aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2004-06-17 18:09:05 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-17 18:09:05 -0700
commit50fbef1d0f2552e76102590e00b292be6d22b181 (patch)
treeee44fc913183e318c346b0dc905596bc0f2d72bc /kernel
parent34485ee4cb43eca0225888a43f5db2a472f2aad4 (diff)
downloadhistory-50fbef1d0f2552e76102590e00b292be6d22b181.tar.gz
[PATCH] remove unnecessary memsets from swsusp and pmdisk
Here's the patch that removes the memset calls from both pmdisk and swsusp. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/pmdisk.c1
-rw-r--r--kernel/power/swsusp.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/kernel/power/pmdisk.c b/kernel/power/pmdisk.c
index 1bff954d688989..5933cc999c6171 100644
--- a/kernel/power/pmdisk.c
+++ b/kernel/power/pmdisk.c
@@ -806,7 +806,6 @@ static int __init relocate_pagedir(void)
err = -ENOMEM;
while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order))) {
- memset(m, 0, PAGE_SIZE);
if (!does_collide_order(old_pagedir, (unsigned long)m,
pagedir_order)) {
pm_pagedir_nosave = new_pagedir = m;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 886a6d9b38c26b..41b3ad0301ac7c 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -936,7 +936,6 @@ static int relocate_pagedir(void)
}
while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order))) {
- memset(m, 0, PAGE_SIZE);
if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order))
break;
eaten_memory = m;