diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 22:04:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 22:04:59 +0100 |
| commit | 50569687e9c688a8688982805be6d8e3c8879042 (patch) | |
| tree | bd01cba8f9ba9f260650b42e958af36a1089ad42 /arch | |
| parent | Merge tag 'nios2-v3.19-rc1' of git://git.rocketboards.org/linux-socfpga-next (diff) | |
| parent | m68k/mm: Eliminate memset after alloc_bootmem_pages (diff) | |
| download | linux-50569687e9c688a8688982805be6d8e3c8879042.tar.xz linux-50569687e9c688a8688982805be6d8e3c8879042.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/mm: Eliminate memset after alloc_bootmem_pages
nubus: Remove superfluous interrupt disable/restore
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index acaff6a49e35..b09a3cb29b68 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -94,7 +94,6 @@ void __init paging_init(void) high_memory = (void *) end_mem; empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); - memset(empty_zero_page, 0, PAGE_SIZE); /* * Set up SFC/DFC registers (user data space). |