"arm64: alternatives: use tpidr_el2 on VHE hosts" v4.9 backport missing edits to proc.S

[Stephen Warren <swarren@xxxxxxxxxxxxx>]

James,

I'm looking at commit 6d99b68933fbcf51f84fcbba49246ce1209ec193 ("arm64: 
alternatives: use tpidr_el2 on VHE hosts"). When it was back-ported to 
v4.9.x as eea59020a7f2993018ccde317387031c04c62036, the changes to 
arch/arm64/mm/proc.S weren't included. I assume this was just an 
accident, or was there some specific reason for this? Either way, I do 
find that I need those changes for system suspend/resume to work in my 
downstream vendor fork of v4.9 if I enable KVM support in .config. I'm 
happy to send a patch for v4.9.x to add those changes back if that's the 
way to go. v4.14.x and later don't have this issue.

Thanks.