Fix merge issue with arch/arm64/kvm/guest.c

Fixes a build problem introduced by e4231afb32c1 ("Merge 3.18.124 into
android-3.18").

Since 3dc433ff6929 ("BACKPORT: arm64: Keep track of CPU feature
registers") the arm64 CPU feature registers cannot be used directly,
they must be used indirectly via SYS_xx macros.

Test: make hikey_defconfig && make
Change-Id: Idf5d0033407efae250b89ce929c4012ae71b1251
Reported-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Alistair Strachan <astrachan@google.com>
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 286453f..3eb5201 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -144,7 +144,7 @@
 		u64 mode = (*(u64 *)valp) & COMPAT_PSR_MODE_MASK;
 		switch (mode) {
 		case COMPAT_PSR_MODE_USR:
-			if ((read_cpuid(ID_AA64PFR0_EL1) & 0xf) != 2)
+			if ((read_cpuid(SYS_ID_AA64PFR0_EL1) & 0xf) != 2)
 				return -EINVAL;
 			break;
 		case COMPAT_PSR_MODE_FIQ: