cpu: L2 changes for mainline