openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tile: use pr_warn instead of pr_warning 

Use the more common pr_warn.

Coalesce formats, realign arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2014-12-10 15:59:59 -08:00 committed by Linus Torvalds
parent 4b3ed61485
commit f80e696854
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/tile/kernel/setup.c
View File

@ -534,11 +534,10 @@ static void __init setup_memory(void)
} }
} }
physpages -= dropped_pages; physpages -= dropped_pages;
pr_warning("Only using %ldMB memory;" pr_warn("Only using %ldMB memory - ignoring %ldMB\n",
" ignoring %ldMB.\n", physpages >> (20 - PAGE_SHIFT),
physpages >> (20 - PAGE_SHIFT), dropped_pages >> (20 - PAGE_SHIFT));
dropped_pages >> (20 - PAGE_SHIFT)); pr_warn("Consider using a larger page size\n");
pr_warning("Consider using a larger page size.\n");
} }
#endif #endif
@ -566,9 +565,8 @@ static void __init setup_memory(void)
#ifndef __tilegx__ #ifndef __tilegx__
if (node_end_pfn[0] > MAXMEM_PFN) { if (node_end_pfn[0] > MAXMEM_PFN) {
pr_warning("Only using %ldMB LOWMEM.\n", pr_warn("Only using %ldMB LOWMEM\n", MAXMEM >> 20);
MAXMEM>>20); pr_warn("Use a HIGHMEM enabled kernel\n");
pr_warning("Use a HIGHMEM enabled kernel.\n");
max_low_pfn = MAXMEM_PFN; max_low_pfn = MAXMEM_PFN;
max_pfn = MAXMEM_PFN; max_pfn = MAXMEM_PFN;
node_end_pfn[0] = MAXMEM_PFN; node_end_pfn[0] = MAXMEM_PFN;
@ -1112,8 +1110,8 @@ static void __init load_hv_initrd(void)
fd = hv_fs_findfile((HV_VirtAddr) initramfs_file); fd = hv_fs_findfile((HV_VirtAddr) initramfs_file);
if (fd == HV_ENOENT) { if (fd == HV_ENOENT) {
if (set_initramfs_file) { if (set_initramfs_file) {
pr_warning("No such hvfs initramfs file '%s'\n", pr_warn("No such hvfs initramfs file '%s'\n",
initramfs_file); initramfs_file);
return; return;
} else { } else {
/* Try old backwards-compatible name. */ /* Try old backwards-compatible name. */
@ -1126,8 +1124,8 @@ static void __init load_hv_initrd(void)
stat = hv_fs_fstat(fd); stat = hv_fs_fstat(fd);
BUG_ON(stat.size < 0); BUG_ON(stat.size < 0);
if (stat.flags & HV_FS_ISDIR) { if (stat.flags & HV_FS_ISDIR) {
pr_warning("Ignoring hvfs file '%s': it's a directory.\n", pr_warn("Ignoring hvfs file '%s': it's a directory\n",
initramfs_file); initramfs_file);
return; return;
} }
initrd = alloc_bootmem_pages(stat.size); initrd = alloc_bootmem_pages(stat.size);
@ -1185,9 +1183,8 @@ static void __init validate_hv(void)
HV_Topology topology = hv_inquire_topology(); HV_Topology topology = hv_inquire_topology();
BUG_ON(topology.coord.x != 0 || topology.coord.y != 0); BUG_ON(topology.coord.x != 0 || topology.coord.y != 0);
if (topology.width != 1 || topology.height != 1) { if (topology.width != 1 || topology.height != 1) {
pr_warning("Warning: booting UP kernel on %dx%d grid;" pr_warn("Warning: booting UP kernel on %dx%d grid; will ignore all but first tile\n",
" will ignore all but first tile.\n", topology.width, topology.height);
topology.width, topology.height);
} }
#endif #endif
@ -1393,7 +1390,7 @@ static void __init setup_cpu_maps(void)
static int __init dataplane(char *str) static int __init dataplane(char *str)
{ {
pr_warning("WARNING: dataplane support disabled in this kernel\n"); pr_warn("WARNING: dataplane support disabled in this kernel\n");
return 0; return 0;
} }
@ -1411,8 +1408,8 @@ void __init setup_arch(char **cmdline_p)
len = hv_get_command_line((HV_VirtAddr) boot_command_line, len = hv_get_command_line((HV_VirtAddr) boot_command_line,
COMMAND_LINE_SIZE); COMMAND_LINE_SIZE);
if (boot_command_line[0]) if (boot_command_line[0])
pr_warning("WARNING: ignoring dynamic command line \"%s\"\n", pr_warn("WARNING: ignoring dynamic command line \"%s\"\n",
boot_command_line); boot_command_line);
strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
#else #else
char *hv_cmdline; char *hv_cmdline;