aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/mm/init.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-12-27 04:40:38 -0500
committerMichal Simek <michal.simek@xilinx.com>2013-02-12 05:24:45 -0500
commit6bd55f0bbaebb79b39e147aa864401fd0c94db82 (patch)
treeeffef6e85fcbb6bd2687d881758a48c2377ef18e /arch/microblaze/mm/init.c
parent5b3084b5823339ac7bebca0701b9b89defe11c91 (diff)
microblaze: Fix coding style issues
Fix coding style issues reported by checkpatch.pl. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/mm/init.c')
-rw-r--r--arch/microblaze/mm/init.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index ce80823051ba..8f8b367c079e 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -89,7 +89,7 @@ static unsigned long highmem_setup(void)
89 reservedpages++; 89 reservedpages++;
90 } 90 }
91 totalram_pages += totalhigh_pages; 91 totalram_pages += totalhigh_pages;
92 printk(KERN_INFO "High memory: %luk\n", 92 pr_info("High memory: %luk\n",
93 totalhigh_pages << (PAGE_SHIFT-10)); 93 totalhigh_pages << (PAGE_SHIFT-10));
94 94
95 return reservedpages; 95 return reservedpages;
@@ -142,8 +142,8 @@ void __init setup_memory(void)
142 ((u32)_text <= (memory_start + lowmem_size - 1))) { 142 ((u32)_text <= (memory_start + lowmem_size - 1))) {
143 memory_size = lowmem_size; 143 memory_size = lowmem_size;
144 PAGE_OFFSET = memory_start; 144 PAGE_OFFSET = memory_start;
145 printk(KERN_INFO "%s: Main mem: 0x%x, " 145 pr_info("%s: Main mem: 0x%x, size 0x%08x\n",
146 "size 0x%08x\n", __func__, (u32) memory_start, 146 __func__, (u32) memory_start,
147 (u32) memory_size); 147 (u32) memory_size);
148 break; 148 break;
149 } 149 }
@@ -158,7 +158,7 @@ void __init setup_memory(void)
158 kernel_align_start = PAGE_DOWN((u32)_text); 158 kernel_align_start = PAGE_DOWN((u32)_text);
159 /* ALIGN can be remove because _end in vmlinux.lds.S is align */ 159 /* ALIGN can be remove because _end in vmlinux.lds.S is align */
160 kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start; 160 kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start;
161 printk(KERN_INFO "%s: kernel addr:0x%08x-0x%08x size=0x%08x\n", 161 pr_info("%s: kernel addr:0x%08x-0x%08x size=0x%08x\n",
162 __func__, kernel_align_start, kernel_align_start 162 __func__, kernel_align_start, kernel_align_start
163 + kernel_align_size, kernel_align_size); 163 + kernel_align_size, kernel_align_size);
164 memblock_reserve(kernel_align_start, kernel_align_size); 164 memblock_reserve(kernel_align_start, kernel_align_size);
@@ -181,10 +181,10 @@ void __init setup_memory(void)
181 max_low_pfn = ((u64)memory_start + (u64)lowmem_size) >> PAGE_SHIFT; 181 max_low_pfn = ((u64)memory_start + (u64)lowmem_size) >> PAGE_SHIFT;
182 max_pfn = ((u64)memory_start + (u64)memory_size) >> PAGE_SHIFT; 182 max_pfn = ((u64)memory_start + (u64)memory_size) >> PAGE_SHIFT;
183 183
184 printk(KERN_INFO "%s: max_mapnr: %#lx\n", __func__, max_mapnr); 184 pr_info("%s: max_mapnr: %#lx\n", __func__, max_mapnr);
185 printk(KERN_INFO "%s: min_low_pfn: %#lx\n", __func__, min_low_pfn); 185 pr_info("%s: min_low_pfn: %#lx\n", __func__, min_low_pfn);
186 printk(KERN_INFO "%s: max_low_pfn: %#lx\n", __func__, max_low_pfn); 186 pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
187 printk(KERN_INFO "%s: max_pfn: %#lx\n", __func__, max_pfn); 187 pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn);
188 188
189 /* 189 /*
190 * Find an area to use for the bootmem bitmap. 190 * Find an area to use for the bootmem bitmap.
@@ -246,7 +246,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
246 free_page(addr); 246 free_page(addr);
247 totalram_pages++; 247 totalram_pages++;
248 } 248 }
249 printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10); 249 pr_info("Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
250} 250}
251 251
252#ifdef CONFIG_BLK_DEV_INITRD 252#ifdef CONFIG_BLK_DEV_INITRD
@@ -260,7 +260,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
260 totalram_pages++; 260 totalram_pages++;
261 pages++; 261 pages++;
262 } 262 }
263 printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", 263 pr_notice("Freeing initrd memory: %dk freed\n",
264 (int)(pages * (PAGE_SIZE / 1024))); 264 (int)(pages * (PAGE_SIZE / 1024)));
265} 265}
266#endif 266#endif
@@ -304,11 +304,11 @@ void __init mem_init(void)
304 initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin; 304 initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin;
305 bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start; 305 bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start;
306 306
307 pr_info("Memory: %luk/%luk available (%luk kernel code, " 307 pr_info("Memory: %luk/%luk available (%luk kernel code, ",
308 "%luk reserved, %luk data, %luk bss, %luk init)\n",
309 nr_free_pages() << (PAGE_SHIFT-10), 308 nr_free_pages() << (PAGE_SHIFT-10),
310 num_physpages << (PAGE_SHIFT-10), 309 num_physpages << (PAGE_SHIFT-10),
311 codesize >> 10, 310 codesize >> 10);
311 pr_cont("%luk reserved, %luk data, %luk bss, %luk init)\n",
312 reservedpages << (PAGE_SHIFT-10), 312 reservedpages << (PAGE_SHIFT-10),
313 datasize >> 10, 313 datasize >> 10,
314 bsssize >> 10, 314 bsssize >> 10,
@@ -394,17 +394,17 @@ asmlinkage void __init mmu_init(void)
394 unsigned int kstart, ksize; 394 unsigned int kstart, ksize;
395 395
396 if (!memblock.reserved.cnt) { 396 if (!memblock.reserved.cnt) {
397 printk(KERN_EMERG "Error memory count\n"); 397 pr_emerg("Error memory count\n");
398 machine_restart(NULL); 398 machine_restart(NULL);
399 } 399 }
400 400
401 if ((u32) memblock.memory.regions[0].size < 0x400000) { 401 if ((u32) memblock.memory.regions[0].size < 0x400000) {
402 printk(KERN_EMERG "Memory must be greater than 4MB\n"); 402 pr_emerg("Memory must be greater than 4MB\n");
403 machine_restart(NULL); 403 machine_restart(NULL);
404 } 404 }
405 405
406 if ((u32) memblock.memory.regions[0].size < kernel_tlb) { 406 if ((u32) memblock.memory.regions[0].size < kernel_tlb) {
407 printk(KERN_EMERG "Kernel size is greater than memory node\n"); 407 pr_emerg("Kernel size is greater than memory node\n");
408 machine_restart(NULL); 408 machine_restart(NULL);
409 } 409 }
410 410