Skip to contentSkip to conversation

Actually show KiB rather than pages in "Freeing initrd memory:" message on h3800, m68knommu and microblaze.

PATCH In review Lennart Sorensen 4 participants 16 messages Sep 15, 2009 – Sep 21, 2009 Microblaze architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Actually show KiB rather than pages in "Freeing initrd memory:" message on h3800, m68knommu and microblaze.

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

arch/h8300/mm/init.c +1 -1
index 9942f24..3342f49 100644
@@ -170,7 +170,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk ("Freeing initrd memory: %dk freed\n", pages);
+	printk ("Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Acked-by on v1 1/1
#1 lore raw

Hi Lennart,

Quoted 4 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

Looks ok to me. I can take and push the m68knommu part separately. Or if Andrew wants to take it all as one, here is an:

Regards
Greg

Quoted 40 lines
arch/h8300/mm/init.c +1 -1
index 9942f24..3342f49 100644
@@ -170,7 +170,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk ("Freeing initrd memory: %dk freed\n", pages);
+	printk ("Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
maintainer Acked-by
#2 lore raw

Re: =?us-ascii?Q?=5Bmicroblaze=2Duclinux=5D=20Re=3A=20=5BPATCH=5D=20Actually=20show=20KiB=20rather=20than=20pages=20in=20=22Freeing=20initrd

Quoted 6 lines · Greg Ungerer

Hi Lennart,

Quoted 3 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

Quoted 6 lines
Quoted 1 line

Looks ok to me. I can take and push the m68knommu part separately. Or if Andrew wants to take it all as one, here is an:

As Greg wrote. It will be the best to push it separately. IMHO it will be faster. It is up to you. If you want to add it to microblaze branch please send only patch for microblaze.

If not.

Thanks,
Michal

Quoted 53 lines

Regards
Greg

Quoted 46 lines
arch/h8300/mm/init.c +1 -1
index 9942f24..3342f49 100644
@@ -170,7 +170,7 @@ void free_initrd_mem(unsigned long start, unsigned
 long end)
         totalram_pages++;
         pages++;
     }
-    printk ("Freeing initrd memory: %dk freed\n", pages);
+    printk ("Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE
 / 1024));
 }

#endif

arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned
 long end)
         totalram_pages++;
         pages++;
     }
-    printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+    printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages *
 (PAGE_SIZE / 1024));
 }

#endif

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned
 long end)
         totalram_pages++;
         pages++;
     }
-    printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+    printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages *
 (PAGE_SIZE / 1024));
 }

#endif

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
#3 lore raw

Re: =?us-ascii?Q?=5Bmicroblaze=2Duclinux=5D=20Re=3A=20=5BPATCH=5D=20Actually=20show=20KiB=20rather=20than=20pages=20in=20=22Freeing=20initrd

Quoted 14 lines · Michal Simek
Quoted 6 lines · Greg Ungerer

Hi Lennart,

Quoted 3 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

Quoted 6 lines
Quoted 1 line

Looks ok to me. I can take and push the m68knommu part separately. Or if Andrew wants to take it all as one, here is an:

Quoted 7 lines

As Greg wrote. It will be the best to push it separately. IMHO it will be faster. It is up to you. If you want to add it to microblaze branch please send only patch for microblaze.

If not.

Oh right how silly of me. 3 seperate patches would have been nicer I guess. The original code is certainly copied from one place to the others although I have no idea which architecture was the first to get it wrong.

Would everyone prefer I made 3 patches instead and resent them?

Signature · 1 line
Len Sorensen
maintainer
#4 lore raw

Re: [microblaze-uclinux] Re: =?us-ascii?Q?=5Bmicroblaze=2Duclinux=5D=20Re=3A=20=5BPATCH=5D=20Actually=20show=20KiB=20rather=20than=20pages=20in=20=22Freeing=20initrd

Quoted 19 lines · [email protected] wrote:
Quoted 18 lines · Michal Simek
Quoted 11 lines · Greg Ungerer

Hi Lennart,

Quoted 4 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

Looks ok to me. I can take and push the m68knommu part separately. Or if Andrew wants to take it all as one, here is an:

As Greg wrote. It will be the best to push it separately. IMHO it will be faster. It is up to you. If you want to add it to microblaze branch please send only patch for microblaze.

If not.

Quoted 7 lines
Quoted 1 line

Oh right how silly of me. 3 seperate patches would have been nicer I guess. The original code is certainly copied from one place to the others although I have no idea which architecture was the first to get it wrong.

Would everyone prefer I made 3 patches instead and resent them?

Just do it for microblaze

Thanks,
Michal

Quoted 1 line
Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
#5 lore raw

Re: [microblaze-uclinux] Re: =?us-ascii?Q?=5Bmicroblaze=2Duclinux=5D=20Re=3A=20=5BPATCH=5D=20Actually=20show=20KiB=20rather=20than=20pages=20in=20=22Freeing=20initrd

Quoted 24 lines · Michal Simek
Quoted 21 lines · [email protected] wrote:
Quoted 19 lines · Michal Simek
Quoted 11 lines · Greg Ungerer

Hi Lennart,

Quoted 4 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

Looks ok to me. I can take and push the m68knommu part separately. Or if Andrew wants to take it all as one, here is an:

As Greg wrote. It will be the best to push it separately. IMHO it will be faster. It is up to you. If you want to add it to microblaze branch please send only patch for microblaze.

If not.

Quoted 7 lines
Quoted 5 lines

Oh right how silly of me. 3 seperate patches would have been nicer I guess. The original code is certainly copied from one place to the others although I have no idea which architecture was the first to get it wrong.

Would everyone prefer I made 3 patches instead and resent them?

Just do it for microblaze

Well I just sent a seperate one for each. I misspelled h8300 (as h3800) in the comment before.

Signature · 1 line
Len Sorensen
Acked-by on v1 1/1
#6 lore raw
In reply to Lennart Sorensen

At Tue, 15 Sep 2009 12:50:37 -0400,

Quoted 37 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on h3800, m68knommu and microblaze to show kilobytes as claimed rather than number of pages.

arch/h8300/mm/init.c +1 -1
index 9942f24..3342f49 100644
@@ -170,7 +170,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk ("Freeing initrd memory: %dk freed\n", pages);
+	printk ("Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
arch/microblaze/mm/init.c +0 -0
index f207f1a..ed5f96b 100644

arch/microblaze/mm/init.c void free_initrd_mem(unsigned long start, unsigned long end) · line 186

Quoted 8 lines
arch/microblaze/mm/init.c +1 -1
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 2 lines
Yoshinori Sato
<[email protected]>
#7 lore raw
In reply to Lennart Sorensen

Fix "Freeing initrd memory:" message on microblaze to show kilobytes as claimed rather than number of pages.

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
#8 lore raw

PATCH 1/1 Actually show KiB rather than pages in "Freeing initrd memory:" message on microblaze.

Fix "Freeing initrd memory:" message on microblaze to show kilobytes as claimed rather than number of pages.

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 1 line
Len Sorensen
maintainer
#9 lore raw

Re: [PATCH] Actually show KiB rather than pages in "Freeing initrd memory:" message on microblaze.

Added to next branch.

There were some problems which I fixed.
1. long first description
2. missing microblaze: at the beginning
3. line longer than 80chars

Thanks,
Michal

Quoted 18 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on microblaze to show kilobytes as claimed rather than number of pages.

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
#10 lore raw

Re: [PATCH] Actually show KiB rather than pages in "Freeing initrd memory:" message on microblaze.

Quoted 5 lines · Michal Simek

Added to next branch.

There were some problems which I fixed.
1. long first description
2. missing microblaze: at the beginning

Missing what?

Quoted 1 line

3. line longer than 80chars

Hmm, I thought for sure I had checkpatch.pl claiming all my lines were OK. Odd. Clearly the one below is longer though. How strange.

Quoted 20 lines
Quoted 18 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on microblaze to show kilobytes as claimed rather than number of pages.

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 1 line
Len Sorensen
maintainer
#11 lore raw

Re: [PATCH] Actually show KiB rather than pages in "Freeing initrd memory:" message on microblaze.

Quoted 6 lines · Lennart Sorensen
Quoted 5 lines · Michal Simek

Added to next branch.

There were some problems which I fixed.
1. long first description
2. missing microblaze: at the beginning

I want to have "microblaze:" at the beginning of email/commit message. It is much clear for mailing list, Linus and me.

Thanks,
Michal

Quoted 28 lines

Missing what?

Quoted 1 line

3. line longer than 80chars

Hmm, I thought for sure I had checkpatch.pl claiming all my lines were OK. Odd. Clearly the one below is longer though. How strange.

Quoted 19 lines
Quoted 18 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message on microblaze to show kilobytes as claimed rather than number of pages.

arch/microblaze/mm/init.c +1 -1
index f207f1a..ed5f96b 100644
@@ -180,7 +180,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
#12 lore raw

Re: [PATCH] Actually show KiB rather than pages in "Freeing initrd memory:" message on microblaze.

Quoted 2 lines · Michal Simek

I want to have "microblaze:" at the beginning of email/commit message. It is much clear for mailing list, Linus and me.

Hmm, OK. That makes some sense. I hadn't ever noticed that being a trend.

Signature · 1 line
Len Sorensen
#13 lore raw

PATCH 1/1 Actually show KiB rather than pages in "Freeing initrd memory:" message on h8300.

In reply to Lennart Sorensen

Fix "Freeing initrd memory:" message on h8300 to show kilobytes as claimed rather than number of pages.

arch/h8300/mm/init.c +1 -1
index 9942f24..3342f49 100644
@@ -170,7 +170,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk ("Freeing initrd memory: %dk freed\n", pages);
+	printk ("Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 1 line
Len Sorensen
#14 lore raw

PATCH 1/1 Actually show KiB rather than pages in "Freeing initrd memory:" message on m68knommu.

In reply to Lennart Sorensen

Fix "Freeing initrd memory:" message m68knommu to show kilobytes as claimed rather than number of pages.

arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 1 line
Len Sorensen
#15 lore raw

Re: [PATCH] Actually show KiB rather than pages in "Freeing initrd memory:" message on m68knommu.

Hi Lennart,

Quoted 4 lines · Lennart Sorensen

Fix "Freeing initrd memory:" message m68knommu to show kilobytes as claimed rather than number of pages.

Looks good. I have applied to the m68knommu git tree.

Regards
Greg

Quoted 13 lines
arch/m68knommu/mm/init.c +1 -1
index b1703c6..f3236d0 100644
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		totalram_pages++;
 		pages++;
 	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
 }
 #endif
 
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com