diff options
author | Gustavo F. Padovan <gustavo@las.ic.unicamp.br> | 2008-07-29 01:48:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:21:31 -0400 |
commit | 8092c654de9a964c14d89da56834f73a80548a58 (patch) | |
tree | 2c922d3c19db9820ea4e7760c729d757a311d814 /arch/x86/kernel | |
parent | 7de08b4e1ed8d80e6086f71b7e99fc4b397aae39 (diff) |
x86: add KERN_INFO to printks on process_64.c
Fix many coding style warnings.
Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/process_64.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 4da8514dd25c..3560d7f4d74e 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -161,24 +161,24 @@ void __show_regs(struct pt_regs *regs) | |||
161 | 161 | ||
162 | printk("\n"); | 162 | printk("\n"); |
163 | print_modules(); | 163 | print_modules(); |
164 | printk("Pid: %d, comm: %.20s %s %s %.*s\n", | 164 | printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s\n", |
165 | current->pid, current->comm, print_tainted(), | 165 | current->pid, current->comm, print_tainted(), |
166 | init_utsname()->release, | 166 | init_utsname()->release, |
167 | (int)strcspn(init_utsname()->version, " "), | 167 | (int)strcspn(init_utsname()->version, " "), |
168 | init_utsname()->version); | 168 | init_utsname()->version); |
169 | printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); | 169 | printk(KERN_INFO "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); |
170 | printk_address(regs->ip, 1); | 170 | printk_address(regs->ip, 1); |
171 | printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp, | 171 | printk(KERN_INFO "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, |
172 | regs->flags); | 172 | regs->sp, regs->flags); |
173 | printk("RAX: %016lx RBX: %016lx RCX: %016lx\n", | 173 | printk(KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n", |
174 | regs->ax, regs->bx, regs->cx); | 174 | regs->ax, regs->bx, regs->cx); |
175 | printk("RDX: %016lx RSI: %016lx RDI: %016lx\n", | 175 | printk(KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n", |
176 | regs->dx, regs->si, regs->di); | 176 | regs->dx, regs->si, regs->di); |
177 | printk("RBP: %016lx R08: %016lx R09: %016lx\n", | 177 | printk(KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n", |
178 | regs->bp, regs->r8, regs->r9); | 178 | regs->bp, regs->r8, regs->r9); |
179 | printk("R10: %016lx R11: %016lx R12: %016lx\n", | 179 | printk(KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n", |
180 | regs->r10, regs->r11, regs->r12); | 180 | regs->r10, regs->r11, regs->r12); |
181 | printk("R13: %016lx R14: %016lx R15: %016lx\n", | 181 | printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n", |
182 | regs->r13, regs->r14, regs->r15); | 182 | regs->r13, regs->r14, regs->r15); |
183 | 183 | ||
184 | asm("movl %%ds,%0" : "=r" (ds)); | 184 | asm("movl %%ds,%0" : "=r" (ds)); |
@@ -196,24 +196,26 @@ void __show_regs(struct pt_regs *regs) | |||
196 | cr3 = read_cr3(); | 196 | cr3 = read_cr3(); |
197 | cr4 = read_cr4(); | 197 | cr4 = read_cr4(); |
198 | 198 | ||
199 | printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", | 199 | printk(KERN_INFO "FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", |
200 | fs, fsindex, gs, gsindex, shadowgs); | 200 | fs, fsindex, gs, gsindex, shadowgs); |
201 | printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0); | 201 | printk(KERN_INFO "CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, |
202 | printk("CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4); | 202 | es, cr0); |
203 | printk(KERN_INFO "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, | ||
204 | cr4); | ||
203 | 205 | ||
204 | get_debugreg(d0, 0); | 206 | get_debugreg(d0, 0); |
205 | get_debugreg(d1, 1); | 207 | get_debugreg(d1, 1); |
206 | get_debugreg(d2, 2); | 208 | get_debugreg(d2, 2); |
207 | printk("DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2); | 209 | printk(KERN_INFO "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2); |
208 | get_debugreg(d3, 3); | 210 | get_debugreg(d3, 3); |
209 | get_debugreg(d6, 6); | 211 | get_debugreg(d6, 6); |
210 | get_debugreg(d7, 7); | 212 | get_debugreg(d7, 7); |
211 | printk("DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7); | 213 | printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7); |
212 | } | 214 | } |
213 | 215 | ||
214 | void show_regs(struct pt_regs *regs) | 216 | void show_regs(struct pt_regs *regs) |
215 | { | 217 | { |
216 | printk("CPU %d:", smp_processor_id()); | 218 | printk(KERN_INFO "CPU %d:", smp_processor_id()); |
217 | __show_regs(regs); | 219 | __show_regs(regs); |
218 | show_trace(NULL, regs, (void *)(regs + 1), regs->bp); | 220 | show_trace(NULL, regs, (void *)(regs + 1), regs->bp); |
219 | } | 221 | } |