mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
00079e04fe
commit
2850bc2737
44 changed files with 176 additions and 169 deletions
|
|
@ -266,7 +266,7 @@ int adb_iop_autopoll(int devs)
|
|||
void adb_iop_poll(void)
|
||||
{
|
||||
if (adb_iop_state == idle) adb_iop_start();
|
||||
iop_ism_irq(0, (void *) ADB_IOP, NULL);
|
||||
iop_ism_irq(0, (void *) ADB_IOP);
|
||||
}
|
||||
|
||||
int adb_iop_reset_bus(void)
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ static void macii_poll(void)
|
|||
unsigned long flags;
|
||||
|
||||
local_irq_save(flags);
|
||||
if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL);
|
||||
if (via[IFR] & SR_INT) macii_interrupt(0, NULL);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ maciisi_poll(void)
|
|||
|
||||
local_irq_save(flags);
|
||||
if (via[IFR] & SR_INT) {
|
||||
maciisi_interrupt(0, NULL, NULL);
|
||||
maciisi_interrupt(0, NULL);
|
||||
}
|
||||
else /* avoid calling this function too quickly in a loop */
|
||||
udelay(ADB_DELAY);
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ pmu_init(void)
|
|||
}
|
||||
if (pmu_state == idle) {
|
||||
adb_int_pending = 1;
|
||||
pmu_interrupt(0, NULL, NULL);
|
||||
pmu_interrupt(0, NULL);
|
||||
}
|
||||
pmu_poll();
|
||||
udelay(10);
|
||||
|
|
@ -562,11 +562,11 @@ pmu_poll(void)
|
|||
local_irq_save(flags);
|
||||
if (via1[IFR] & SR_INT) {
|
||||
via1[IFR] = SR_INT;
|
||||
pmu_interrupt(IRQ_MAC_ADB_SR, NULL, NULL);
|
||||
pmu_interrupt(IRQ_MAC_ADB_SR, NULL);
|
||||
}
|
||||
if (via1[IFR] & CB1_INT) {
|
||||
via1[IFR] = CB1_INT;
|
||||
pmu_interrupt(IRQ_MAC_ADB_CL, NULL, NULL);
|
||||
pmu_interrupt(IRQ_MAC_ADB_CL, NULL);
|
||||
}
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue