Commit dd0fd51dc1585941c2edccdb40e5f11ea3a64496
Committed by
Kyle McMartin
Kyle McMartin
1 parent
63af965d2b
[PARISC] Remove the spurious do_softirq calls from entry.S
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>
Showing 1 changed file with 0 additions and 27 deletions Side-by-side Diff
arch/parisc/kernel/entry.S
| ... | ... | @@ -970,9 +970,6 @@ |
| 970 | 970 | add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */ |
| 971 | 971 | #endif /* CONFIG_SMP */ |
| 972 | 972 | |
| 973 | - LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */ | |
| 974 | - cmpib,<>,n 0,%r20,intr_do_softirq /* forward */ | |
| 975 | - | |
| 976 | 973 | intr_check_resched: |
| 977 | 974 | |
| 978 | 975 | /* check for reschedule */ |
| ... | ... | @@ -1017,17 +1014,6 @@ |
| 1017 | 1014 | nop |
| 1018 | 1015 | nop |
| 1019 | 1016 | |
| 1020 | - .import do_softirq,code | |
| 1021 | -intr_do_softirq: | |
| 1022 | - BL do_softirq,%r2 | |
| 1023 | -#ifdef CONFIG_64BIT | |
| 1024 | - ldo -16(%r30),%r29 /* Reference param save area */ | |
| 1025 | -#else | |
| 1026 | - nop | |
| 1027 | -#endif | |
| 1028 | - b intr_check_resched | |
| 1029 | - nop | |
| 1030 | - | |
| 1031 | 1017 | .import schedule,code |
| 1032 | 1018 | intr_do_resched: |
| 1033 | 1019 | /* Only do reschedule if we are returning to user space */ |
| ... | ... | @@ -2096,9 +2082,6 @@ |
| 2096 | 2082 | add %r19,%r20,%r19 /* now have &irq_stat[smp_processor_id()] */ |
| 2097 | 2083 | #endif /* CONFIG_SMP */ |
| 2098 | 2084 | |
| 2099 | - LDREG IRQSTAT_SIRQ_PEND(%r19),%r20 /* hardirq.h: unsigned long */ | |
| 2100 | - cmpib,<>,n 0,%r20,syscall_do_softirq /* forward */ | |
| 2101 | - | |
| 2102 | 2085 | syscall_check_resched: |
| 2103 | 2086 | |
| 2104 | 2087 | /* check for reschedule */ |
| ... | ... | @@ -2235,16 +2218,6 @@ |
| 2235 | 2218 | copy %r25,%r16 |
| 2236 | 2219 | b intr_restore |
| 2237 | 2220 | nop |
| 2238 | - | |
| 2239 | - .import do_softirq,code | |
| 2240 | -syscall_do_softirq: | |
| 2241 | - BL do_softirq,%r2 | |
| 2242 | - nop | |
| 2243 | - /* NOTE: We enable I-bit incase we schedule later, | |
| 2244 | - * and we might be going back to userspace if we were | |
| 2245 | - * traced. */ | |
| 2246 | - b syscall_check_resched | |
| 2247 | - ssm PSW_SM_I, %r0 /* do_softirq returns with I bit off */ | |
| 2248 | 2221 | |
| 2249 | 2222 | .import schedule,code |
| 2250 | 2223 | syscall_do_resched: |