diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-25 05:10:59 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-24 20:44:04 -0400 |
commit | 45d1564cceea8105c51b065acc8ec1312b81fbc1 (patch) | |
tree | aa93b06ad46e2f5887b5f90a21f6a2088ae5d543 /arch/m68k/mm | |
parent | b6844e8f64920cdee620157252169ba63afb0c89 (diff) |
m68knommu: Make empty_zero_page "void *", like on m68k
This allows to get rid of the casts.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/mm')
-rw-r--r-- | arch/m68k/mm/init_no.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c index 7cbd7bd1f8bc..fdbe6795f270 100644 --- a/arch/m68k/mm/init_no.c +++ b/arch/m68k/mm/init_no.c | |||
@@ -42,7 +42,7 @@ | |||
42 | * ZERO_PAGE is a special page that is used for zero-initialized | 42 | * ZERO_PAGE is a special page that is used for zero-initialized |
43 | * data and COW. | 43 | * data and COW. |
44 | */ | 44 | */ |
45 | unsigned long empty_zero_page; | 45 | void *empty_zero_page; |
46 | 46 | ||
47 | extern unsigned long memory_start; | 47 | extern unsigned long memory_start; |
48 | extern unsigned long memory_end; | 48 | extern unsigned long memory_end; |
@@ -62,8 +62,8 @@ void __init paging_init(void) | |||
62 | unsigned long end_mem = memory_end & PAGE_MASK; | 62 | unsigned long end_mem = memory_end & PAGE_MASK; |
63 | unsigned long zones_size[MAX_NR_ZONES] = {0, }; | 63 | unsigned long zones_size[MAX_NR_ZONES] = {0, }; |
64 | 64 | ||
65 | empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); | 65 | empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); |
66 | memset((void *)empty_zero_page, 0, PAGE_SIZE); | 66 | memset(empty_zero_page, 0, PAGE_SIZE); |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * Set up SFC/DFC registers (user data space). | 69 | * Set up SFC/DFC registers (user data space). |