diff options
author | Gustavo F. Padovan <gustavo@las.ic.unicamp.br> | 2008-08-02 11:50:37 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:11:37 -0400 |
commit | 48e2bd56b1d1ae4b95fb21be778927b64d5c4235 (patch) | |
tree | 5579813086bb32f0d4446691ef4998d6ce86bddc | |
parent | d9336a9b47d57db835453968efbd0d5cedfe0260 (diff) |
x86: coding style fixes to arch/x86/kernel/traps_64.c
Fix coding style of traps_64.c with improvements suggested by Ingo.
Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/traps_64.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index fe36d96ba70b..5df5d2e97ece 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -84,8 +84,8 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) | |||
84 | 84 | ||
85 | void printk_address(unsigned long address, int reliable) | 85 | void printk_address(unsigned long address, int reliable) |
86 | { | 86 | { |
87 | printk(" [<%016lx>] %s%pS\n", address, reliable ? | 87 | printk(" [<%016lx>] %s%pS\n", |
88 | "" : "? ", (void *) address); | 88 | address, reliable ? "" : "? ", (void *) address); |
89 | } | 89 | } |
90 | 90 | ||
91 | static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, | 91 | static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, |
@@ -98,8 +98,8 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, | |||
98 | [STACKFAULT_STACK - 1] = "#SS", | 98 | [STACKFAULT_STACK - 1] = "#SS", |
99 | [MCE_STACK - 1] = "#MC", | 99 | [MCE_STACK - 1] = "#MC", |
100 | #if DEBUG_STKSZ > EXCEPTION_STKSZ | 100 | #if DEBUG_STKSZ > EXCEPTION_STKSZ |
101 | [N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ / | 101 | [N_EXCEPTION_STACKS ... |
102 | EXCEPTION_STKSZ - 2] = "#DB[?]" | 102 | N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]" |
103 | #endif | 103 | #endif |
104 | }; | 104 | }; |
105 | unsigned k; | 105 | unsigned k; |
@@ -363,8 +363,10 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | |||
363 | unsigned long *irqstack = | 363 | unsigned long *irqstack = |
364 | (unsigned long *) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE); | 364 | (unsigned long *) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE); |
365 | 365 | ||
366 | /* debugging aid: "show_stack(NULL, NULL);" prints the | 366 | /* |
367 | back trace for this cpu. */ | 367 | * debugging aid: "show_stack(NULL, NULL);" prints the |
368 | * back trace for this cpu. | ||
369 | */ | ||
368 | 370 | ||
369 | if (sp == NULL) { | 371 | if (sp == NULL) { |
370 | if (task) | 372 | if (task) |