diff options
| author | Helge Deller <deller@gmx.de> | 2007-01-01 21:47:21 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-02-17 07:00:56 +0100 |
| commit | df47b4386a473eba87095e6dea8046762434817d (patch) | |
| tree | 4665cd1ef72f2201b3296e3e6254057f4dab56de /arch | |
| parent | [PARISC] use fls_long in irq.c (diff) | |
| download | linux-df47b4386a473eba87095e6dea8046762434817d.tar.xz linux-df47b4386a473eba87095e6dea8046762434817d.zip | |
[PARISC] a and b in "break a,b" message were swapped
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 16 | ||||
| -rw-r--r-- | arch/parisc/kernel/traps.c | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 340b5e8d67ba..39a12c1fc6f5 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -1115,11 +1115,7 @@ intr_extint: mfctl %cr31,%r1 copy %r30,%r17 /* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/ -#ifdef CONFIG_64BIT - depdi 0,63,15,%r17 -#else - depi 0,31,15,%r17 -#endif + DEPI 0,31,15,%r17 CMPB=,n %r1,%r17,2f get_stack_use_cr31 b,n 3f @@ -1999,10 +1995,10 @@ sys_sigaltstack_wrapper: STREG %r2, -RP_OFFSET(%r30) #ifdef CONFIG_64BIT ldo FRAME_SIZE(%r30), %r30 - b,l do_sigaltstack,%r2 + BL do_sigaltstack,%r2 ldo -16(%r30),%r29 /* Reference param save area */ #else - bl do_sigaltstack,%r2 + BL do_sigaltstack,%r2 ldo FRAME_SIZE(%r30), %r30 #endif @@ -2019,7 +2015,7 @@ sys32_sigaltstack_wrapper: LDREG TASK_PT_GR30(%r24),%r24 STREG %r2, -RP_OFFSET(%r30) ldo FRAME_SIZE(%r30), %r30 - b,l do_sigaltstack32,%r2 + BL do_sigaltstack32,%r2 ldo -16(%r30),%r29 /* Reference param save area */ ldo -FRAME_SIZE(%r30), %r30 @@ -2037,10 +2033,10 @@ sys_rt_sigsuspend_wrapper: STREG %r2, -RP_OFFSET(%r30) #ifdef CONFIG_64BIT ldo FRAME_SIZE(%r30), %r30 - b,l sys_rt_sigsuspend,%r2 + BL sys_rt_sigsuspend,%r2 ldo -16(%r30),%r29 /* Reference param save area */ #else - bl sys_rt_sigsuspend,%r2 + BL sys_rt_sigsuspend,%r2 ldo FRAME_SIZE(%r30), %r30 #endif diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 286d26e288f8..7bf9e36f010d 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -316,7 +316,7 @@ static void handle_break(struct pt_regs *regs) #ifdef PRINT_USER_FAULTS if (unlikely(iir != GDB_BREAK_INSN)) { 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); show_regs(regs); } |