Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0f16996cf2ed7c368dd95b4c517ce572b96a10f5

Authored by Fabian Frederick
Committed by Jason Wessel
1 parent a1465d2f39
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

kernel/debug/debug_core.c: Logging clean-up 

-Convert printk( to pr_foo()
-Add pr_fmt
-Coalesce formats

Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

Showing 1 changed file with 21 additions and 22 deletions Side-by-side Diff

kernel/debug/debug_core.c
Diff comments   View file @ 0f16996
... ... @@ -27,6 +27,9 @@
27 27 * version 2. This program is licensed "as is" without any warranty of any
28 28 * kind, whether express or implied.
29 29 */
  30 +
  31 +#define pr_fmt(fmt) "KGDB: " fmt
  32 +
30 33 #include <linux/pid_namespace.h>
31 34 #include <linux/clocksource.h>
32 35 #include <linux/serial_core.h>
... ... @@ -196,8 +199,8 @@
196 199 return err;
197 200 err = kgdb_arch_remove_breakpoint(&tmp);
198 201 if (err)
199   - printk(KERN_ERR "KGDB: Critical breakpoint error, kernel "
200   - "memory destroyed at: %lx", addr);
  202 + pr_err("Critical breakpoint error, kernel memory destroyed at: %lx\n",
  203 + addr);
201 204 return err;
202 205 }
203 206  
... ... @@ -256,8 +259,8 @@
256 259 error = kgdb_arch_set_breakpoint(&kgdb_break[i]);
257 260 if (error) {
258 261 ret = error;
259   - printk(KERN_INFO "KGDB: BP install failed: %lx",
260   - kgdb_break[i].bpt_addr);
  262 + pr_info("BP install failed: %lx\n",
  263 + kgdb_break[i].bpt_addr);
261 264 continue;
262 265 }
263 266  
... ... @@ -319,8 +322,8 @@
319 322 continue;
320 323 error = kgdb_arch_remove_breakpoint(&kgdb_break[i]);
321 324 if (error) {
322   - printk(KERN_INFO "KGDB: BP remove failed: %lx\n",
323   - kgdb_break[i].bpt_addr);
  325 + pr_info("BP remove failed: %lx\n",
  326 + kgdb_break[i].bpt_addr);
324 327 ret = error;
325 328 }
326 329  
... ... @@ -367,7 +370,7 @@
367 370 goto setundefined;
368 371 error = kgdb_arch_remove_breakpoint(&kgdb_break[i]);
369 372 if (error)
370   - printk(KERN_ERR "KGDB: breakpoint remove failed: %lx\n",
  373 + pr_err("breakpoint remove failed: %lx\n",
371 374 kgdb_break[i].bpt_addr);
372 375 setundefined:
373 376 kgdb_break[i].state = BP_UNDEFINED;
374 377  
... ... @@ -400,9 +403,9 @@
400 403 if (print_wait) {
401 404 #ifdef CONFIG_KGDB_KDB
402 405 if (!dbg_kdb_mode)
403   - printk(KERN_CRIT "KGDB: waiting... or $3#33 for KDB\n");
  406 + pr_crit("waiting... or $3#33 for KDB\n");
404 407 #else
405   - printk(KERN_CRIT "KGDB: Waiting for remote debugger\n");
  408 + pr_crit("Waiting for remote debugger\n");
406 409 #endif
407 410 }
408 411 return 1;
... ... @@ -430,8 +433,7 @@
430 433 exception_level = 0;
431 434 kgdb_skipexception(ks->ex_vector, ks->linux_regs);
432 435 dbg_activate_sw_breakpoints();
433   - printk(KERN_CRIT "KGDB: re-enter error: breakpoint removed %lx\n",
434   - addr);
  436 + pr_crit("re-enter error: breakpoint removed %lx\n", addr);
435 437 WARN_ON_ONCE(1);
436 438  
437 439 return 1;
... ... @@ -444,7 +446,7 @@
444 446 panic("Recursive entry to debugger");
445 447 }
446 448  
447   - printk(KERN_CRIT "KGDB: re-enter exception: ALL breakpoints killed\n");
  449 + pr_crit("re-enter exception: ALL breakpoints killed\n");
448 450 #ifdef CONFIG_KGDB_KDB
449 451 /* Allow kdb to debug itself one level */
450 452 return 0;
451 453  
452 454  
... ... @@ -800,15 +802,15 @@
800 802 static void sysrq_handle_dbg(int key)
801 803 {
802 804 if (!dbg_io_ops) {
803   - printk(KERN_CRIT "ERROR: No KGDB I/O module available\n");
  805 + pr_crit("ERROR: No KGDB I/O module available\n");
804 806 return;
805 807 }
806 808 if (!kgdb_connected) {
807 809 #ifdef CONFIG_KGDB_KDB
808 810 if (!dbg_kdb_mode)
809   - printk(KERN_CRIT "KGDB or $3#33 for KDB\n");
  811 + pr_crit("KGDB or $3#33 for KDB\n");
810 812 #else
811   - printk(KERN_CRIT "Entering KGDB\n");
  813 + pr_crit("Entering KGDB\n");
812 814 #endif
813 815 }
814 816  
... ... @@ -950,7 +952,7 @@
950 952 {
951 953 kgdb_break_asap = 0;
952 954  
953   - printk(KERN_CRIT "kgdb: Waiting for connection from remote gdb...\n");
  955 + pr_crit("Waiting for connection from remote gdb...\n");
954 956 kgdb_breakpoint();
955 957 }
956 958  
... ... @@ -969,8 +971,7 @@
969 971 if (dbg_io_ops) {
970 972 spin_unlock(&kgdb_registration_lock);
971 973  
972   - printk(KERN_ERR "kgdb: Another I/O driver is already "
973   - "registered with KGDB.\n");
  974 + pr_err("Another I/O driver is already registered with KGDB\n");
974 975 return -EBUSY;
975 976 }
976 977  
... ... @@ -986,8 +987,7 @@
986 987  
987 988 spin_unlock(&kgdb_registration_lock);
988 989  
989   - printk(KERN_INFO "kgdb: Registered I/O driver %s.\n",
990   - new_dbg_io_ops->name);
  990 + pr_info("Registered I/O driver %s\n", new_dbg_io_ops->name);
991 991  
992 992 /* Arm KGDB now. */
993 993 kgdb_register_callbacks();
... ... @@ -1022,8 +1022,7 @@
1022 1022  
1023 1023 spin_unlock(&kgdb_registration_lock);
1024 1024  
1025   - printk(KERN_INFO
1026   - "kgdb: Unregistered I/O driver %s, debugger disabled.\n",
  1025 + pr_info("Unregistered I/O driver %s, debugger disabled\n",
1027 1026 old_dbg_io_ops->name);
1028 1027 }
1029 1028 EXPORT_SYMBOL_GPL(kgdb_unregister_io_module);