* [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k
@ 2011-05-25 9:10 Geert Uytterhoeven
2011-05-25 9:11 ` [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem() Geert Uytterhoeven
2011-05-26 4:39 ` [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Greg Ungerer
0 siblings, 2 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2011-05-25 9:10 UTC (permalink / raw)
To: Greg Ungerer; +Cc: linux-kernel, uclinux-dev, Geert Uytterhoeven
This allows to get rid of the casts.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
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 7cbd7bd..fdbe679 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).
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem()
2011-05-25 9:10 [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Geert Uytterhoeven
@ 2011-05-25 9:11 ` Geert Uytterhoeven
2011-05-26 4:41 ` Greg Ungerer
2011-05-26 4:39 ` [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Greg Ungerer
1 sibling, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2011-05-25 9:11 UTC (permalink / raw)
To: Greg Ungerer; +Cc: linux-kernel, uclinux-dev, Geert Uytterhoeven
arch/m68k/mm/init_no.c:123: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘long unsigned int’
And use pr_notice() while we're at it.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m68k/mm/init_no.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c
index fdbe679..50cd12c 100644
--- a/arch/m68k/mm/init_no.c
+++ b/arch/m68k/mm/init_no.c
@@ -120,7 +120,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
totalram_pages++;
pages++;
}
- printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
+ pr_notice("Freeing initrd memory: %luk freed\n",
+ pages * (PAGE_SIZE / 1024));
}
#endif
@@ -141,7 +142,7 @@ void free_initmem(void)
free_page(addr);
totalram_pages++;
}
- printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
+ pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
(addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
(int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
(int)(addr - PAGE_SIZE));
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem()
2011-05-25 9:11 ` [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem() Geert Uytterhoeven
@ 2011-05-26 4:41 ` Greg Ungerer
0 siblings, 0 replies; 6+ messages in thread
From: Greg Ungerer @ 2011-05-26 4:41 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Greg Ungerer, linux-kernel, uclinux-dev
Hi Geert,
On 25/05/11 19:11, Geert Uytterhoeven wrote:
> arch/m68k/mm/init_no.c:123: warning: format æ%dÆ expects type æintÆ, but argument 2 has type ælong unsigned intÆ
>
> And use pr_notice() while we're at it.
>
> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Regards
Greg
> ---
> arch/m68k/mm/init_no.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c
> index fdbe679..50cd12c 100644
> --- a/arch/m68k/mm/init_no.c
> +++ b/arch/m68k/mm/init_no.c
> @@ -120,7 +120,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
> totalram_pages++;
> pages++;
> }
> - printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
> + pr_notice("Freeing initrd memory: %luk freed\n",
> + pages * (PAGE_SIZE / 1024));
> }
> #endif
>
> @@ -141,7 +142,7 @@ void free_initmem(void)
> free_page(addr);
> totalram_pages++;
> }
> - printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
> + pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
> (addr - PAGE_ALIGN((long)&__init_begin))>> 10,
> (int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
> (int)(addr - PAGE_SIZE));
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k
2011-05-25 9:10 [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Geert Uytterhoeven
2011-05-25 9:11 ` [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem() Geert Uytterhoeven
@ 2011-05-26 4:39 ` Greg Ungerer
2011-05-26 5:11 ` Geert Uytterhoeven
1 sibling, 1 reply; 6+ messages in thread
From: Greg Ungerer @ 2011-05-26 4:39 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Greg Ungerer, linux-kernel, uclinux-dev
Hi Geert,
On 25/05/11 19:10, Geert Uytterhoeven wrote:
> This allows to get rid of the casts.
>
> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
Looks good:
Acked-by: Greg Ungerer <gerg@uclinux.org>
Do you want me to add to the m68knommu git tree?
Or are these part of a series you intend pushing yourself?
Regards
Greg
> ---
> 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 7cbd7bd..fdbe679 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).
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k
2011-05-26 4:39 ` [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Greg Ungerer
@ 2011-05-26 5:11 ` Geert Uytterhoeven
2011-05-26 5:52 ` Greg Ungerer
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2011-05-26 5:11 UTC (permalink / raw)
To: Greg Ungerer; +Cc: Greg Ungerer, linux-kernel, uclinux-dev
Hi Greg,
On Thu, May 26, 2011 at 06:39, Greg Ungerer <gerg@snapgear.com> wrote:
> On 25/05/11 19:10, Geert Uytterhoeven wrote:
>> This allows to get rid of the casts.
>>
>> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
>
> Looks good:
>
> Acked-by: Greg Ungerer <gerg@uclinux.org>
>
> Do you want me to add to the m68knommu git tree?
> Or are these part of a series you intend pushing yourself?
Please add it to your tree.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k
2011-05-26 5:11 ` Geert Uytterhoeven
@ 2011-05-26 5:52 ` Greg Ungerer
0 siblings, 0 replies; 6+ messages in thread
From: Greg Ungerer @ 2011-05-26 5:52 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Greg Ungerer, linux-kernel, uclinux-dev
Hi Geert,
On 26/05/11 15:11, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Thu, May 26, 2011 at 06:39, Greg Ungerer<gerg@snapgear.com> wrote:
>> On 25/05/11 19:10, Geert Uytterhoeven wrote:
>>> This allows to get rid of the casts.
>>>
>>> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
>>
>> Looks good:
>>
>> Acked-by: Greg Ungerer<gerg@uclinux.org>
>>
>> Do you want me to add to the m68knommu git tree?
>> Or are these part of a series you intend pushing yourself?
>
> Please add it to your tree.
Done!
Thanks
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-26 5:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-25 9:10 [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Geert Uytterhoeven
2011-05-25 9:11 ` [PATCH 4/4] m68knommu: Fix printk() format in free_initrd_mem() Geert Uytterhoeven
2011-05-26 4:41 ` Greg Ungerer
2011-05-26 4:39 ` [PATCH 3/4] m68knommu: Make empty_zero_page "void *", like on m68k Greg Ungerer
2011-05-26 5:11 ` Geert Uytterhoeven
2011-05-26 5:52 ` Greg Ungerer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox