Skip to content

Commit

Permalink
[PARISC] remove remnants of parisc-specific softirq code
Browse files Browse the repository at this point in the history
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: Grant Grundler <grundler@parisc-linux.org>
[and tested on a c8000 64-bit SMP --kyle]
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  • Loading branch information
Grant Grundler authored and Kyle McMartin committed May 30, 2007
1 parent 8dff980 commit 72738a9
Showing 1 changed file with 1 addition and 34 deletions.
35 changes: 1 addition & 34 deletions arch/parisc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 72738a9

Please sign in to comment.