ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)