Skip to content

Commit

Permalink
[PARISC] Remove the spurious do_softirq calls from entry.S
Browse files Browse the repository at this point in the history
remove the spurious do_softirq calls from entry.S

With these in we were calling do_softirq twice; plus the calls in
entry.S took no account of nesting.

Signed-off-by: James Bottomley <jejb@parisc-linux.org>

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  • Loading branch information
James Bottomley authored and Kyle McMartin committed Oct 22, 2005
1 parent 63af965 commit dd0fd51
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions arch/parisc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,6 @@ intr_return:
add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */
#endif /* CONFIG_SMP */

LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */
cmpib,<>,n 0,%r20,intr_do_softirq /* forward */

intr_check_resched:

/* check for reschedule */
Expand Down Expand Up @@ -1017,17 +1014,6 @@ intr_restore:
nop
nop

.import do_softirq,code
intr_do_softirq:
BL do_softirq,%r2
#ifdef CONFIG_64BIT
ldo -16(%r30),%r29 /* Reference param save area */
#else
nop
#endif
b intr_check_resched
nop

.import schedule,code
intr_do_resched:
/* Only do reschedule if we are returning to user space */
Expand Down Expand Up @@ -2096,9 +2082,6 @@ syscall_check_bh:
add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */
#endif /* CONFIG_SMP */

LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */
cmpib,<>,n 0,%r20,syscall_do_softirq /* forward */

syscall_check_resched:

/* check for reschedule */
Expand Down Expand Up @@ -2236,16 +2219,6 @@ pt_regs_ok:
b intr_restore
nop

.import do_softirq,code
syscall_do_softirq:
BL do_softirq,%r2
nop
/* NOTE: We enable I-bit incase we schedule later,
* and we might be going back to userspace if we were
* traced. */
b syscall_check_resched
ssm PSW_SM_I, %r0 /* do_softirq returns with I bit off */

.import schedule,code
syscall_do_resched:
BL schedule,%r2
Expand Down

0 comments on commit dd0fd51

Please sign in to comment.