arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups