From: Johannes Weiner <[email protected]>
show_free_areas() already displays free swap space, no need to do it a
second time in show_mem() which calls the former anyway.
Signed-off-by: Johannes Weiner <[email protected]>
---
arch/x86/mm/init_64.c | 3 ---
arch/x86/mm/pgtable_32.c | 1 -
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 8230d1e..94baf63 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -89,9 +89,6 @@ void show_mem(void)
printk(KERN_INFO "Mem-info:\n");
show_free_areas();
- printk(KERN_INFO "Free swap: %6ldkB\n",
- nr_swap_pages << (PAGE_SHIFT-10));
-
for_each_online_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; ++i) {
/*
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 6530201..bacae27 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -32,7 +32,6 @@ void show_mem(void)
printk(KERN_INFO "Mem-info:\n");
show_free_areas();
- printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_online_pgdat(pgdat) {
pgdat_resize_lock(pgdat, &flags);
for (i = 0; i < pgdat->node_spanned_pages; ++i) {
--
1.5.2.2
On Mon, 10 Mar 2008, Johannes Weiner wrote:
> From: Johannes Weiner <[email protected]>
>
> show_free_areas() already displays free swap space, no need to do it a
> second time in show_mem() which calls the former anyway.
>
> Signed-off-by: Johannes Weiner <[email protected]>
I heartily approve of this; and yes, it's the per-arch one which should
go (since its "alignment" looks nasty). But there's a lot more arches
than just x86 which should be fixed (and so rather more work, preparing
those patches for the various maintainers) - is that something you'd
have time to do? (Don't worry, "No" is a perfectly fair answer, and
it's no way essential that all change at once.)
Thanks,
Hugh
> ---
> arch/x86/mm/init_64.c | 3 ---
> arch/x86/mm/pgtable_32.c | 1 -
> 2 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index 8230d1e..94baf63 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -89,9 +89,6 @@ void show_mem(void)
>
> printk(KERN_INFO "Mem-info:\n");
> show_free_areas();
> - printk(KERN_INFO "Free swap: %6ldkB\n",
> - nr_swap_pages << (PAGE_SHIFT-10));
> -
> for_each_online_pgdat(pgdat) {
> for (i = 0; i < pgdat->node_spanned_pages; ++i) {
> /*
> diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
> index 6530201..bacae27 100644
> --- a/arch/x86/mm/pgtable_32.c
> +++ b/arch/x86/mm/pgtable_32.c
> @@ -32,7 +32,6 @@ void show_mem(void)
>
> printk(KERN_INFO "Mem-info:\n");
> show_free_areas();
> - printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
> for_each_online_pgdat(pgdat) {
> pgdat_resize_lock(pgdat, &flags);
> for (i = 0; i < pgdat->node_spanned_pages; ++i) {
Hi,
Hugh Dickins <[email protected]> writes:
> On Mon, 10 Mar 2008, Johannes Weiner wrote:
>> From: Johannes Weiner <[email protected]>
>>
>> show_free_areas() already displays free swap space, no need to do it a
>> second time in show_mem() which calls the former anyway.
>>
>> Signed-off-by: Johannes Weiner <[email protected]>
>
> I heartily approve of this; and yes, it's the per-arch one which should
> go (since its "alignment" looks nasty). But there's a lot more arches
> than just x86 which should be fixed (and so rather more work, preparing
> those patches for the various maintainers) - is that something you'd
> have time to do? (Don't worry, "No" is a perfectly fair answer, and
> it's no way essential that all change at once.)
Yes, I will whip something up. Thanks for the feedback.
Hannes
* Johannes Weiner <[email protected]> wrote:
> From: Johannes Weiner <[email protected]>
>
> show_free_areas() already displays free swap space, no need to do it a
> second time in show_mem() which calls the former anyway.
thanks, applied.
Ingo