Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df47b438 authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

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



And clean up 32/64bit branch assembler statements

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 0c2de3c6

arch/parisc/kernel/entry.S

+6 −10
Original line number Diff line number Diff line
@@ -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

arch/parisc/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}