diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /arch/m68k/mm/motorola.c | |
parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'arch/m68k/mm/motorola.c')
-rw-r--r-- | arch/m68k/mm/motorola.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 30d34f285024..226795bdf355 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
@@ -285,7 +285,6 @@ void __init paging_init(void) | |||
285 | * to a couple of allocated pages | 285 | * to a couple of allocated pages |
286 | */ | 286 | */ |
287 | empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); | 287 | empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); |
288 | memset(empty_zero_page, 0, PAGE_SIZE); | ||
289 | 288 | ||
290 | /* | 289 | /* |
291 | * Set up SFC/DFC registers | 290 | * Set up SFC/DFC registers |