Backport additional CPU options for 3.2 kernels