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

Commit 72738a96 authored by Grant Grundler's avatar Grant Grundler Committed by Kyle McMartin
Browse files

[PARISC] remove remnants of parisc-specific softirq code 



Kyle,

This patch removes remnants of softirq support that we no longer need.
I suspect this was just overlooked when willy convert parisc to generic
IRQ support.

Tested on c3600 32-bit UP.

Signed-off-by: default avatarGrant Grundler <grundler@parisc-linux.org>
[and tested on a c8000 64-bit SMP --kyle]
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 8dff980f

arch/parisc/kernel/entry.S

+1 −34
Original line number Diff line number Diff line
@@ -954,21 +954,6 @@ intr_return: 
	/* NOTE: Need to enable interrupts incase we schedule. */

	ssm     PSW_SM_I, %r0



	/* Check for software interrupts */



	.import irq_stat,data



	load32	irq_stat,%r19

#ifdef CONFIG_SMP

	mfctl   %cr30,%r1

	ldw	TI_CPU(%r1),%r1 /* get cpu # - int */

	/* shift left ____cacheline_aligned (aka L1_CACHE_BYTES) amount

	** irq_stat[] is defined using ____cacheline_aligned.

	*/

	SHLREG	%r1,L1_CACHE_SHIFT,%r20

	add     %r19,%r20,%r19	/* now have &irq_stat[smp_processor_id()] */

#endif /* CONFIG_SMP */



intr_check_resched:



	/* check for reschedule */
@@ -2055,24 +2040,6 @@ ENTRY(syscall_exit) 
	 */

	loadgp



syscall_check_bh:



	/* Check for software interrupts */



	.import irq_stat,data



	load32	irq_stat,%r19



#ifdef CONFIG_SMP

	/* sched.h: int processor */

	/* %r26 is used as scratch register to index into irq_stat[] */

	ldw     TI_CPU-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r26 /* cpu # */



	/* shift left ____cacheline_aligned (aka L1_CACHE_BYTES) bits */

	SHLREG	%r26,L1_CACHE_SHIFT,%r20

	add     %r19,%r20,%r19	/* now have &irq_stat[smp_processor_id()] */

#endif /* CONFIG_SMP */



syscall_check_resched:



	/* check for reschedule */
@@ -2244,7 +2211,7 @@ syscall_do_resched: 
#else

	nop

#endif

	b       syscall_check_bh  /* if resched, we start over again */

	b	syscall_check_resched	/* if resched, we start over again */

	nop

ENDPROC(syscall_exit)