diff options
author | Helge Deller <deller@gmx.de> | 2007-01-01 15:47:21 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-02-17 01:00:56 -0500 |
commit | df47b4386a473eba87095e6dea8046762434817d (patch) | |
tree | 4665cd1ef72f2201b3296e3e6254057f4dab56de /arch/parisc/kernel/entry.S | |
parent | 0c2de3c6c481ba6a537f66c06a55bd5be5a2c99d (diff) |
[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/parisc/kernel/entry.S')
-rw-r--r-- | arch/parisc/kernel/entry.S | 16 |
1 files changed, 6 insertions, 10 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: | |||
1115 | mfctl %cr31,%r1 | 1115 | mfctl %cr31,%r1 |
1116 | copy %r30,%r17 | 1116 | copy %r30,%r17 |
1117 | /* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/ | 1117 | /* FIXME! depi below has hardcoded idea of interrupt stack size (32k)*/ |
1118 | #ifdef CONFIG_64BIT | 1118 | DEPI 0,31,15,%r17 |
1119 | depdi 0,63,15,%r17 | ||
1120 | #else | ||
1121 | depi 0,31,15,%r17 | ||
1122 | #endif | ||
1123 | CMPB=,n %r1,%r17,2f | 1119 | CMPB=,n %r1,%r17,2f |
1124 | get_stack_use_cr31 | 1120 | get_stack_use_cr31 |
1125 | b,n 3f | 1121 | b,n 3f |
@@ -1999,10 +1995,10 @@ sys_sigaltstack_wrapper: | |||
1999 | STREG %r2, -RP_OFFSET(%r30) | 1995 | STREG %r2, -RP_OFFSET(%r30) |
2000 | #ifdef CONFIG_64BIT | 1996 | #ifdef CONFIG_64BIT |
2001 | ldo FRAME_SIZE(%r30), %r30 | 1997 | ldo FRAME_SIZE(%r30), %r30 |
2002 | b,l do_sigaltstack,%r2 | 1998 | BL do_sigaltstack,%r2 |
2003 | ldo -16(%r30),%r29 /* Reference param save area */ | 1999 | ldo -16(%r30),%r29 /* Reference param save area */ |
2004 | #else | 2000 | #else |
2005 | bl do_sigaltstack,%r2 | 2001 | BL do_sigaltstack,%r2 |
2006 | ldo FRAME_SIZE(%r30), %r30 | 2002 | ldo FRAME_SIZE(%r30), %r30 |
2007 | #endif | 2003 | #endif |
2008 | 2004 | ||
@@ -2019,7 +2015,7 @@ sys32_sigaltstack_wrapper: | |||
2019 | LDREG TASK_PT_GR30(%r24),%r24 | 2015 | LDREG TASK_PT_GR30(%r24),%r24 |
2020 | STREG %r2, -RP_OFFSET(%r30) | 2016 | STREG %r2, -RP_OFFSET(%r30) |
2021 | ldo FRAME_SIZE(%r30), %r30 | 2017 | ldo FRAME_SIZE(%r30), %r30 |
2022 | b,l do_sigaltstack32,%r2 | 2018 | BL do_sigaltstack32,%r2 |
2023 | ldo -16(%r30),%r29 /* Reference param save area */ | 2019 | ldo -16(%r30),%r29 /* Reference param save area */ |
2024 | 2020 | ||
2025 | ldo -FRAME_SIZE(%r30), %r30 | 2021 | ldo -FRAME_SIZE(%r30), %r30 |
@@ -2037,10 +2033,10 @@ sys_rt_sigsuspend_wrapper: | |||
2037 | STREG %r2, -RP_OFFSET(%r30) | 2033 | STREG %r2, -RP_OFFSET(%r30) |
2038 | #ifdef CONFIG_64BIT | 2034 | #ifdef CONFIG_64BIT |
2039 | ldo FRAME_SIZE(%r30), %r30 | 2035 | ldo FRAME_SIZE(%r30), %r30 |
2040 | b,l sys_rt_sigsuspend,%r2 | 2036 | BL sys_rt_sigsuspend,%r2 |
2041 | ldo -16(%r30),%r29 /* Reference param save area */ | 2037 | ldo -16(%r30),%r29 /* Reference param save area */ |
2042 | #else | 2038 | #else |
2043 | bl sys_rt_sigsuspend,%r2 | 2039 | BL sys_rt_sigsuspend,%r2 |
2044 | ldo FRAME_SIZE(%r30), %r30 | 2040 | ldo FRAME_SIZE(%r30), %r30 |
2045 | #endif | 2041 | #endif |
2046 | 2042 | ||