diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-25 11:10:59 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-25 02:44:04 +0200 |
| commit | 45d1564cceea8105c51b065acc8ec1312b81fbc1 (patch) | |
| tree | aa93b06ad46e2f5887b5f90a21f6a2088ae5d543 /arch/m68k | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-45d1564cceea8105c51b065acc8ec1312b81fbc1.tar.xz linux-45d1564cceea8105c51b065acc8ec1312b81fbc1.zip | |
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')
| -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 @@ * ZERO_PAGE is a special page that is used for zero-initialized * data and COW. */ -unsigned long empty_zero_page; +void *empty_zero_page; extern unsigned long memory_start; extern unsigned long memory_end; @@ -62,8 +62,8 @@ void __init paging_init(void) unsigned long end_mem = memory_end & PAGE_MASK; unsigned long zones_size[MAX_NR_ZONES] = {0, }; - empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); - memset((void *)empty_zero_page, 0, PAGE_SIZE); + empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); + memset(empty_zero_page, 0, PAGE_SIZE); /* * Set up SFC/DFC registers (user data space). |