iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] x86_64: Clean up white space in traps.c

Browse Source 
Attached is a small code style cleanup patch that resulted from my
skimming through the arch/x86_64/kernel/traps.c code to figure out what
went haywire.

Signed-off-by: Roberto Nibali <ratz@drugphish.ch>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roberto Nibali 2006-03-25 16:29:55 +01:00 committed by Linus Torvalds
parent b2b978f980
commit 2b692a872c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86_64/kernel/traps.c
View File

@ -124,7 +124,7 @@ int printk_address(unsigned long address)
if (!modname)
modname = delim = "";
return printk("<%016lx>{%s%s%s%s%+ld}",
address,delim,modname,delim,symname,offset);
address, delim, modname, delim, symname, offset);
}
#else
int printk_address(unsigned long address)
@ -336,13 +336,12 @@ void show_registers(struct pt_regs *regs)
show_stack(NULL, (unsigned long*)rsp);
printk("\nCode: ");
if(regs->rip < PAGE_OFFSET)
if (regs->rip < PAGE_OFFSET)
goto bad;
for(i=0;i<20;i++)
{
for (i=0; i<20; i++) {
unsigned char c;
if(__get_user(c, &((unsigned char*)regs->rip)[i])) {
if (__get_user(c, &((unsigned char*)regs->rip)[i])) {
bad:
printk(" Bad RIP value.");
break;
@ -481,7 +480,7 @@ static void __kprobes do_trap(int trapnr, int signr, char *str,
printk(KERN_INFO
"%s[%d] trap %s rip:%lx rsp:%lx error:%lx\n",
tsk->comm, tsk->pid, str,
regs->rip,regs->rsp,error_code);
regs->rip, regs->rsp, error_code);
if (info)
force_sig_info(signr, info, tsk);
@ -495,9 +494,9 @@ static void __kprobes do_trap(int trapnr, int signr, char *str,
{
const struct exception_table_entry *fixup;
fixup = search_exception_tables(regs->rip);
if (fixup) {
if (fixup)
regs->rip = fixup->fixup;
} else
else
die(str, regs, error_code);
return;
}
@ -570,7 +569,7 @@ asmlinkage void __kprobes do_general_protection(struct pt_regs * regs,
printk(KERN_INFO
"%s[%d] general protection rip:%lx rsp:%lx error:%lx\n",
tsk->comm, tsk->pid,
regs->rip,regs->rsp,error_code);
regs->rip, regs->rsp, error_code);
force_sig(SIGSEGV, tsk);
return;