subject:"\[PATCH 2\/2\] x86\: use pr

[PATCH 2/2] x86: use pr_default() macro

2016-02-05 Thread Chen Yucong

 - convert printk(KERN_DEFAULT ...) to pr_default(...)

Signed-off-by: Chen Yucong 
---
 arch/x86/kernel/dumpstack.c|  3 +--
 arch/x86/kernel/dumpstack_64.c |  4 ++--
 arch/x86/kernel/process_32.c   | 29 ++---
 arch/x86/kernel/process_64.c   | 41 -
 arch/x86/mm/fault.c|  2 +-
 5 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 993706a..1ae9a6d 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -257,8 +257,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
unsigned short ss;
unsigned long sp;
 #endif
-   printk(KERN_DEFAULT
-  "%s: %04lx [#%d] ", str, err & 0x, ++die_counter);
+   pr_default("%s: %04lx [#%d] ", str, err & 0x, ++die_counter);
 #ifdef CONFIG_PREEMPT
printk("PREEMPT ");
 #endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 5f1c626..8e6c739 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -316,11 +316,11 @@ void show_regs(struct pt_regs *regs)
unsigned char c;
u8 *ip;
 
-   printk(KERN_DEFAULT "Stack:\n");
+   pr_default("Stack:\n");
show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
   0, KERN_DEFAULT);
 
-   printk(KERN_DEFAULT "Code: ");
+   pr_default("Code: ");
 
ip = (u8 *)regs->ip - code_prologue;
if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 9f95091..4039da4 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -83,17 +83,17 @@ void __show_regs(struct pt_regs *regs, int all)
savesegment(gs, gs);
}
 
-   printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
-   (u16)regs->cs, regs->ip, regs->flags,
-   smp_processor_id());
+   pr_default("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
+  (u16)regs->cs, regs->ip, regs->flags,
+  smp_processor_id());
print_symbol("EIP is at %s\n", regs->ip);
 
-   printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-   regs->ax, regs->bx, regs->cx, regs->dx);
-   printk(KERN_DEFAULT "ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
-   regs->si, regs->di, regs->bp, sp);
-   printk(KERN_DEFAULT " DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
-  (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
+   pr_default("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
+  regs->ax, regs->bx, regs->cx, regs->dx);
+   pr_default("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
+  regs->si, regs->di, regs->bp, sp);
+   pr_default(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
+  (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
 
if (!all)
return;
@@ -102,8 +102,8 @@ void __show_regs(struct pt_regs *regs, int all)
cr2 = read_cr2();
cr3 = read_cr3();
cr4 = __read_cr4_safe();
-   printk(KERN_DEFAULT "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",
-   cr0, cr2, cr3, cr4);
+   pr_default("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",
+  cr0, cr2, cr3, cr4);
 
get_debugreg(d0, 0);
get_debugreg(d1, 1);
@@ -117,10 +117,9 @@ void __show_regs(struct pt_regs *regs, int all)
(d6 == DR6_RESERVED) && (d7 == 0x400))
return;
 
-   printk(KERN_DEFAULT "DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",
-   d0, d1, d2, d3);
-   printk(KERN_DEFAULT "DR6: %08lx DR7: %08lx\n",
-   d6, d7);
+   pr_default("DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",
+  d0, d1, d2, d3);
+   pr_default("DR6: %08lx DR7: %08lx\n", d6, d7);
 }
 
 void release_thread(struct task_struct *dead_task)
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 71a18a2..37ff6be 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -61,20 +61,20 @@ void __show_regs(struct pt_regs *regs, int all)
unsigned int fsindex, gsindex;
unsigned int ds, cs, es;
 
-   printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0x, 
regs->ip);
+   pr_default("RIP: %04lx:[<%016lx>] ", regs->cs & 0x, regs->ip);
printk_address(regs->ip);
-   printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,
-   regs->sp, regs->flags);
-   printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",
-  regs->ax, regs->bx, regs->cx);
-   printk(KERN_DEFAULT

[PATCH 2/2] x86: use pr_default() macro

2016-02-05 Thread Chen Yucong

 - convert printk(KERN_DEFAULT ...) to pr_default(...)

Signed-off-by: Chen Yucong 
---
 arch/x86/kernel/dumpstack.c|  3 +--
 arch/x86/kernel/dumpstack_64.c |  4 ++--
 arch/x86/kernel/process_32.c   | 29 ++---
 arch/x86/kernel/process_64.c   | 41 -
 arch/x86/mm/fault.c|  2 +-
 5 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 993706a..1ae9a6d 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -257,8 +257,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
unsigned short ss;
unsigned long sp;
 #endif
-   printk(KERN_DEFAULT
-  "%s: %04lx [#%d] ", str, err & 0x, ++die_counter);
+   pr_default("%s: %04lx [#%d] ", str, err & 0x, ++die_counter);
 #ifdef CONFIG_PREEMPT
printk("PREEMPT ");
 #endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 5f1c626..8e6c739 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -316,11 +316,11 @@ void show_regs(struct pt_regs *regs)
unsigned char c;
u8 *ip;
 
-   printk(KERN_DEFAULT "Stack:\n");
+   pr_default("Stack:\n");
show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
   0, KERN_DEFAULT);
 
-   printk(KERN_DEFAULT "Code: ");
+   pr_default("Code: ");
 
ip = (u8 *)regs->ip - code_prologue;
if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 9f95091..4039da4 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -83,17 +83,17 @@ void __show_regs(struct pt_regs *regs, int all)
savesegment(gs, gs);
}
 
-   printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
-   (u16)regs->cs, regs->ip, regs->flags,
-   smp_processor_id());
+   pr_default("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
+  (u16)regs->cs, regs->ip, regs->flags,
+  smp_processor_id());
print_symbol("EIP is at %s\n", regs->ip);
 
-   printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-   regs->ax, regs->bx, regs->cx, regs->dx);
-   printk(KERN_DEFAULT "ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
-   regs->si, regs->di, regs->bp, sp);
-   printk(KERN_DEFAULT " DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
-  (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
+   pr_default("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
+  regs->ax, regs->bx, regs->cx, regs->dx);
+   pr_default("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
+  regs->si, regs->di, regs->bp, sp);
+   pr_default(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
+  (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
 
if (!all)
return;
@@ -102,8 +102,8 @@ void __show_regs(struct pt_regs *regs, int all)
cr2 = read_cr2();
cr3 = read_cr3();
cr4 = __read_cr4_safe();
-   printk(KERN_DEFAULT "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",
-   cr0, cr2, cr3, cr4);
+   pr_default("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",
+  cr0, cr2, cr3, cr4);
 
get_debugreg(d0, 0);
get_debugreg(d1, 1);
@@ -117,10 +117,9 @@ void __show_regs(struct pt_regs *regs, int all)
(d6 == DR6_RESERVED) && (d7 == 0x400))
return;
 
-   printk(KERN_DEFAULT "DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",
-   d0, d1, d2, d3);
-   printk(KERN_DEFAULT "DR6: %08lx DR7: %08lx\n",
-   d6, d7);
+   pr_default("DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",
+  d0, d1, d2, d3);
+   pr_default("DR6: %08lx DR7: %08lx\n", d6, d7);
 }
 
 void release_thread(struct task_struct *dead_task)
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 71a18a2..37ff6be 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -61,20 +61,20 @@ void __show_regs(struct pt_regs *regs, int all)
unsigned int fsindex, gsindex;
unsigned int ds, cs, es;
 
-   printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0x, 
regs->ip);
+   pr_default("RIP: %04lx:[<%016lx>] ", regs->cs & 0x, regs->ip);
printk_address(regs->ip);
-   printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,
-   regs->sp, regs->flags);
-   printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",
-  regs->ax, regs->bx, regs->cx);
-

[PATCH 2/2] x86: use pr_default() macro

[PATCH 2/2] x86: use pr_default() macro

2 matches

Site Navigation

Mail list logo

Footer information