[PATCH 4.20 0/1] Fix regression from arm spectre patch series