lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PARISC] a and b in "break a,b" message were swapped

Browse Source 
And clean up 32/64bit branch assembler statements

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:
Helge Deller
2007-01-01 21:47:21 +01:00
committed by Kyle McMartin
parent 0c2de3c6c4
commit df47b4386a
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/parisc/kernel/entry.S
View File

@@ -1115,11 +1115,7 @@ intr_extint:
mfctl %cr31,%r1 mfctl %cr31,%r1
copy %r30,%r17 copy %r30,%r17
/* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/ /* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/
#ifdef CONFIG_64BIT DEPI 0,31,15,%r17
depdi 0,63,15,%r17
#else
depi 0,31,15,%r17
#endif
CMPB=,n %r1,%r17,2f CMPB=,n %r1,%r17,2f
get_stack_use_cr31 get_stack_use_cr31
b,n 3f b,n 3f
@@ -1999,10 +1995,10 @@ sys_sigaltstack_wrapper:
STREG %r2, -RP_OFFSET(%r30) STREG %r2, -RP_OFFSET(%r30)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
ldo FRAME_SIZE(%r30), %r30 ldo FRAME_SIZE(%r30), %r30
b,l do_sigaltstack,%r2 BL do_sigaltstack,%r2
ldo -16(%r30),%r29 /* Reference param save area */ ldo -16(%r30),%r29 /* Reference param save area */
#else #else
bl do_sigaltstack,%r2 BL do_sigaltstack,%r2
ldo FRAME_SIZE(%r30), %r30 ldo FRAME_SIZE(%r30), %r30
#endif #endif
@@ -2019,7 +2015,7 @@ sys32_sigaltstack_wrapper:
LDREG TASK_PT_GR30(%r24),%r24 LDREG TASK_PT_GR30(%r24),%r24
STREG %r2, -RP_OFFSET(%r30) STREG %r2, -RP_OFFSET(%r30)
ldo FRAME_SIZE(%r30), %r30 ldo FRAME_SIZE(%r30), %r30
b,l do_sigaltstack32,%r2 BL do_sigaltstack32,%r2
ldo -16(%r30),%r29 /* Reference param save area */ ldo -16(%r30),%r29 /* Reference param save area */
ldo -FRAME_SIZE(%r30), %r30 ldo -FRAME_SIZE(%r30), %r30
@@ -2037,10 +2033,10 @@ sys_rt_sigsuspend_wrapper:
STREG %r2, -RP_OFFSET(%r30) STREG %r2, -RP_OFFSET(%r30)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
ldo FRAME_SIZE(%r30), %r30 ldo FRAME_SIZE(%r30), %r30
b,l sys_rt_sigsuspend,%r2 BL sys_rt_sigsuspend,%r2
ldo -16(%r30),%r29 /* Reference param save area */ ldo -16(%r30),%r29 /* Reference param save area */
#else #else
bl sys_rt_sigsuspend,%r2 BL sys_rt_sigsuspend,%r2
ldo FRAME_SIZE(%r30), %r30 ldo FRAME_SIZE(%r30), %r30
#endif #endif

2
arch/parisc/kernel/traps.c
View File

@@ -316,7 +316,7 @@ static void handle_break(struct pt_regs *regs)
#ifdef PRINT_USER_FAULTS #ifdef PRINT_USER_FAULTS
if (unlikely(iir != GDB_BREAK_INSN)) { if (unlikely(iir != GDB_BREAK_INSN)) {
printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n", printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n",
(iir>>13) & ((1<<13)-1), iir & 31, iir & 31, (iir>>13) & ((1<<13)-1),
current->pid, current->comm); current->pid, current->comm);
show_regs(regs); show_regs(regs);
} }