aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/init.c3
-rw-r--r--arch/ia64/mm/contig.c2
-rw-r--r--arch/ia64/mm/discontig.c2
-rw-r--r--arch/parisc/mm/init.c2
-rw-r--r--arch/unicore32/mm/init.c3
5 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index ad722f1208a5..ad9a9f3f0322 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -99,6 +99,9 @@ void show_mem(unsigned int filter)
99 printk("Mem-info:\n"); 99 printk("Mem-info:\n");
100 show_free_areas(filter); 100 show_free_areas(filter);
101 101
102 if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
103 return;
104
102 for_each_bank (i, mi) { 105 for_each_bank (i, mi) {
103 struct membank *bank = &mi->bank[i]; 106 struct membank *bank = &mi->bank[i];
104 unsigned int pfn1, pfn2; 107 unsigned int pfn1, pfn2;
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 80dab509dfb0..67c59ebec899 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -47,6 +47,8 @@ void show_mem(unsigned int filter)
47 printk(KERN_INFO "Mem-info:\n"); 47 printk(KERN_INFO "Mem-info:\n");
48 show_free_areas(filter); 48 show_free_areas(filter);
49 printk(KERN_INFO "Node memory in pages:\n"); 49 printk(KERN_INFO "Node memory in pages:\n");
50 if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
51 return;
50 for_each_online_pgdat(pgdat) { 52 for_each_online_pgdat(pgdat) {
51 unsigned long present; 53 unsigned long present;
52 unsigned long flags; 54 unsigned long flags;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index c2e955ee79a8..a57436e5d405 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -623,6 +623,8 @@ void show_mem(unsigned int filter)
623 623
624 printk(KERN_INFO "Mem-info:\n"); 624 printk(KERN_INFO "Mem-info:\n");
625 show_free_areas(filter); 625 show_free_areas(filter);
626 if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
627 return;
626 printk(KERN_INFO "Node memory in pages:\n"); 628 printk(KERN_INFO "Node memory in pages:\n");
627 for_each_online_pgdat(pgdat) { 629 for_each_online_pgdat(pgdat) {
628 unsigned long present; 630 unsigned long present;
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462de53a4..cf2da13c41e6 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -697,6 +697,8 @@ void show_mem(unsigned int filter)
697 697
698 printk(KERN_INFO "Mem-info:\n"); 698 printk(KERN_INFO "Mem-info:\n");
699 show_free_areas(filter); 699 show_free_areas(filter);
700 if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
701 return;
700#ifndef CONFIG_DISCONTIGMEM 702#ifndef CONFIG_DISCONTIGMEM
701 i = max_mapnr; 703 i = max_mapnr;
702 while (i-- > 0) { 704 while (i-- > 0) {
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
index de186bde8975..644482882bae 100644
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -66,6 +66,9 @@ void show_mem(unsigned int filter)
66 printk(KERN_DEFAULT "Mem-info:\n"); 66 printk(KERN_DEFAULT "Mem-info:\n");
67 show_free_areas(filter); 67 show_free_areas(filter);
68 68
69 if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
70 return;
71
69 for_each_bank(i, mi) { 72 for_each_bank(i, mi) {
70 struct membank *bank = &mi->bank[i]; 73 struct membank *bank = &mi->bank[i];
71 unsigned int pfn1, pfn2; 74 unsigned int pfn1, pfn2;